Storage & Indexing fixes