Features/uat 10 sample identifiers in grid view

Fixed issues in gridview, mentioned in UAT-10 and SAN-94.