Pushed index logic to indextop as well