Added fallback functionality to the module switcher