Changes to how clear/top is handled on the domain end