[#53072815] Major performance improvements to the group selector.