Grassley selector fixes