Fixes for location pages