Cosmetic changes
Improve the search so that now it's more awesome