Clean + edit Tags now work like they should