Added handling for unstructured GP Name