Updated catchall and iron-router