Bug 1109351 - fix searchStr handling wrt buildername