Resolved client order issues. Merge between controllers/services needed