Fix the shepherd to not use non-ready templates + fix the empty groups case