more fixes for indexAll();