Disable CatalogSwitch without JSON Navigation
Make the return button work on Catalog view.