fixed bug in API & further streamlined versionqueryexecutor