Fix for constructing query part of script request. And fix for on.selector.