Simpler grid query

- Made grid query extend name value collection. So that dependant code
could use grid query instead of it's query property.