some fixes and tag items table