* Fixed basic search for new API