Jpommer/euca 7828 - merging in wizard search rework.