Fixed search with capitalize