Removing ambiguity and non-working selectors