Expand selectors properly