Issue 517 categories

Fix minor errors in the categories feature branch