Remove garbage 'opts' and rename search hooks