changed database
made tags mostly work
Merge pull request #3 from Subscribble/changed-database

Changed database