Fix null location in public_data