#68 fixes on query parameter url structure

This fixes the issue on query parameter URL structures. 
Added escaping to `?`.