more index search fixes, some warnings eliminated