Add initial support for Search
Improve search