re-commit query fix