Fix removing tags bug