more selector fixes