Clean up map query and results