Fix invalid relative path handling in d1dd9bc
Enable catalog save-state setting for any order

(no sort-order restriction since catalog-mode improvements in sp62403)