Remove compilation error; Fix incorrect location string logic which separated location building from location office