Adding support for sorting including catalogue numbers

Fixes #31