detection of 'untagged' fixed. Refs: #169.
as suggested by luowy.
And a line of debug code removed.

Signed-off-by: Josef Templ <josef.templ@gmail.com>