Fix Flow add new topics and reply

Change-Id: I7334ee564b0746c5b0e749aa78456b53b2a44cd6