make datastore-id test consistent with application-id (i.e use increment
strategy for M-N ids)