Fix storage for full-text and keyword-based search