Revise some query