optimize ContentSelector