bug: [] Continued fix of the tags bug