Added search and native query