Router "debouncing" bug fixes