Change sig id matching to use 6 characters if available