update
ok, now using just the defined parameter scheme
update map_query
ok, got the map query kind of working
update to use new mapped parameter