Clean up locations pkeys and default empty fields from field