SONAR-5250 Keep order when toggling internals, highlight internals