Refactor code to support changes in report category schema
Close #87 Fix possible incorrect category data