improved selector semantics