Reordered the search field to be last, and added proper type filtering to mapping search.