fix #SPOI-2156 Installer - Navigation Code Cleanup