[BUGFIX beta] Sync router.js, fix index route issues

Fixes #3913