* updated search queries to proper mapping keys (uper case)