Totally agree OP! It's such a clunky system they've implemented.

Definitely going to try the macro solution though.