Make 'create gift query' a menu option in either the file or gift (or where ever) drop down menus within a Batch. this way if for what ever reason you didn't create a gift query when you committed the batch you will always have the option to go back and ask RE to do so.

this way you do not have to create a gift query from scratch, you simply tell RE you want a query on a specific batch within the batch itself - this would save lots of time! esp if you do constant clean up of your gift queries and accidentally delete one OR you have someone committing gifts who does not know to create a query when the system asks.