[HW]	-- replaced query mapper with query builder
	-- simplified search query mapper
[HW]	-- Query is now a concrete class