You're right, the search need more work. This is def something I will work on.