Labels and search are going to take some extra time, added a bucket for each

May hold off on search until the indexer can also be updated...