Fixing web service to support single quotes in building name