Got rid of queryChecker