Bump version
Exclude bogus empty metadata categories
Code clean-up
More consistent handling of metadata category title