Keep ajax error from trying to show empty messages
Cleaned up the router logic a little
More updates to the router
Fixed the config template file
Merge branch 'router' into 2.2/develop