Fix focus lost, sort issue and added DataField