Split 'add directive' selector into multiple selectors [story:44854253]