fix regression issues and jsonp issuews