Fix the remaining tags submission occurrences