Moved basket tags to @Tag pickup