Using dynmic lookup for Primary Location type. Issue: aar/OASIS#549