hotfixes for query helper