Fix for tags indexation