Fixed refactoring bug. Improved tag handling to remove tagparse-saving.