Fix selector for optional element removal