add query-migrate
bug fix in new query
Revert "bug fix in new query"

This reverts commit 3eb54ce53781c663410cd271e0caea7cbb771191.
bug fix in vars
Merge branch 'hotfix/fix_vars'