tweaks to queries and vtm updates

* add ids to queries
* update vtm water queries
suppress_simplification config for layers