Improved custom tag 'now' -> 'wait'