Fix prev/next location loading