Refactored categories.
Fixed potential parser issues.
Merge branch 'dev-abstract_models' of https://github.com/testify-no/ecFeed.git into dev-abstract_models