Audit lab matching

Fixed issues raised