more selector optimization