added more generic Query interface
Merge branch 'master' of ssh://git@github.com/BestSolution-at/emap.git