better remapping of go to tag and pop