Fix world location filter resetting organisation

https://www.pivotaltracker.com/story/show/58497920