WIP: Fixing select marker with router.