Fix to include template root in selectors