Fix to handle weird scenarios where the request urls to assets contain query string