Major overhaul to keep private tagging separate