Add reselectContext and fix reSelect decorator