index search cleanup, fix get