some selector fixes