Reset button and tag fixes
Merged