Feat/updated scroll to tag