Updated tagging structure in database recreation scripts