Add colon and trailing space to some of the bundle props
Adjust final search condition/wait to use its own lock object.