Fixed index issue on text type fields