Fix responsible selection for indicators