selector fixes