Performance boost on FolderItem indexing, fix crash when query params are black