Fix for full-text-search