bug fix: H2 db error - nullable primary key
make category intersection clearer
Merge pull request #1070 from stevewithington/develop

bug fix: H2 db error - nullable primary key
Tweaking logic
Merge branch 'develop'