Fix around override of datasearch