added ids to client queries
Merge branch 'jseip1679'