Fix problem with parsing query decl.
Merge branch 'devel' of elmo.lanl.gov:gitlab/scout into devel