Fix route tagging in FF