Some bug fixes for capturing repeated route calls
fixed merge conflicts