Bugfixes.
Merge branch 'master' of https://github.com/HansPinckaers/query-editor