Migrated SearchDemo to unified api