Only add token on Enter if non-empty, add tokens on delimiter