BADJOPEN separate field for arrival and departure gap

Currently we have trigger to send Gap upsell email based on gap before arrival and gap after departure.
However the BADJOPEN shows both the arrival and departure gaps.

I want the ability to send arrival date gap first, based on how the availability close to the departure I want to send the departure gap, not both at the same time in the content.
I hope we can get this feature. 

Also, like its said in another request, the language used for {BADJOPEN} can be better.

It would be nice if owners had the option to show how much availability is available. A simple box that states how many nights to show for each would be great. For example an owner could select to show 5 days before arrival and 2 days after departure.