Added in specific attribute search for name and value to ensure additional attributes are correctly set up