Match on 15 and 18 digit ID's