Adjusted tags to be more accurate