Updated query management commands