better handling of selector arg completion