Better search enablement handling in contact tests. (justinvdm, Hodgestar)