fix duplicate return record in db & modify UI