Fixes / implements searchIndex() support