Fixes to make catalog selection and language fallback work on the backend side.