Fix search to allow search by only to work