Updated the building name selector

Now works for all cases (saving and retrieving)