Fixed Minor Search Bugs
Android done