More index/find/findAll adjustments.