fix issues with the client queue
fix issues with the client queue - merge