Quick hack to allow indexing of non-UTF8 data

Will fix later
Merge branch 'master' into deploy