Reordered the execution of TaskExtraData::fillTags() method after the template usage check in the Tasks helper. Adjusted filters with an additional condition on 'Company' instances in TaskExtraDataTest. Commented out a condition in TaskExtraData which improves compatibility with the current working version. The changes enhance reliability of task data filling and test coverages.