Improved tags and strategy targets indexation