- bug fixes for flow key change