Fix OPDS category links to composite columns
Merge branch 'master' of https://github.com/cbhaley/calibre