Makes Gadget search scenarios pass