revert query bugs

we need to ensure that CR is not set to auto revert new edits by same
users before failing, otherwise it's not possible to rollback some edits