more consistent treatment of locations