Refactor query execution

Original MWW implementation is rather pragmatic and dirty

(from redmine: issue id 613, created on 2018-01-22tgradl)

• Relations:
  • relates #622