+ Added query strings handling
* Fixed subresource query strings handling