Collapse tags and small fixes