Tweaked route and filter registration