added live search bar
merge