Move query from body