Bugfix - query type hackary