another fix for tokens with min="0", this time for end markers
[pl] fixes and disambiguation