Correct geo menu and partialization