tweaked subscribe option, update index