Added category id paramter to enable data to be displayed in multiple formats with only one entry, plus minor bug fixes and new Table category.