You can put a few shapes into one container and it's still much faster than searching color-first.