Modified Tags to reflect changes in the database