Fixed bug in searching for BldgProgram

This commit overwrites last changes the Chris made and added his fix.
Fixed input name changes fixes