Updated database tagger