fixed some routing issues-optimized client workflow