Added search type spinner. Draft