Finally fixed empty tag bug.
Thanks to github.com/thonixx for the beer ... ehm the fix :D