Same problem for me, it's been years that I use a "Maintenance" for that with the following disadvantages:
-> Brutal and non-progressive change that stresses animals
-> Cut off most alarms and therefore risk of doing stupiditys ...

GHL announced a few years ago that it was planned enlightenment scenes but it never came.