client-id and query argument logging added