Fix token generating
Fix domain/record list error if it's empty