Move LocalQueries commands to be member functions
#2245
Merged
LocalQueries commands to be member functions
#2245