Changing router onBeforeAction handers to waitOn