Fix locations not being displayed properly