Changed tag names
Optimized DB querying
Started description