[NUCCORE-1115] Fix check on toDatastoreType method to try to ensure correct selection