Add sort by file extension, fix some catalogue issues