Fix collapse

- Screwed up set_tag_opt with RLock simplification
- Missed instance of new lines() usages