improve search_null