add tags fields + enhance repopulation