* Added new categories and updated queries.
Merge remote-tracking branch 'origin/master'