added empty check for datatokens