Fix search with key value