Now navigates correctly across environments and sites