Fixed callbacks for re-indexing