Search Fixes

Small fixes based on testing from Kavinga.