Fixed quesries for 1D, added check for working queries
Merge remote-tracking branch 'devel/vcs_queries'