Fixed some data elements
Merge branch 'filtertag' of https://github.com/appiphony/Phillips into filtertag