Fix for collapsing location field labels