Fixed issues with the "Category" subject look up