improve CategorySelector performance by a magnitude of about 370 million