Correct for valuequery