Bugfix: gadget lost/duplicate at search for gadgets