Added diagnostic form code to the result returned by search criteria