[KFSQA-1011] move step more appropriate in routing