Hashtag fix and cleanup