Add 'idx' param everywhere