Add search widget & fix bug in search output