Switch to ListView to display search result
Solve merge conflict