Latest search widget patch from Stef