Avoid error for URLs with spaces in them
SOAP-1516 Make the request counter rely on the ModelBuilder instead of counting (wrong) by itself