Restore compatibility of search with 1.5-beta1