Reduce the size of the revert queries by not using any linebreaks. They are not made to be readable anyway.
Always enable the Revert Query menu item, even if the setting is disabled. Should not be a limitation just because you don't want to generate revert queries at the given moment.