Add search view and do some refinements