Minor fix in the layout; Fix the query service, now return a map