fix tagging system, now you can collect all