WCM-143 Add short-description where is needed
WCM-150 Use the theme display to get the scope group, right now we can get the theme display because we change the filter for a pre action service