Fix problems with textsearch

Change-Id: I0b8864c481b0c339b5c0cb4ac05b18675a89f958