Closes #39 and fixes similar issue for categories, versions etc