Bugfix for query values