Fix: change intanceB-location to be dropdown

Enable saving of prefLabel of instance A and B location for better display
Enable saving prefLabel of storage-location
ARMS-160 #Done Display node labels not values