Tweaking tag/list, bugfixes