Remove database names and add tag tables