Make basic search function less crap