more router event triggering fixes