CF-147: Fix location id field set to empty string when selecting a location