fixed routing issues related to new flow