Query Command Merge

Merged in gis database query commands by Chris with floating buttons.