location.choices fixed