Merge lp:~abreu-alexandre/unity-js-scopes/fix-classnames-docs into lp:unity-js-scopes

[Alexandre Abreu]

Update the class names & associated examples for the export JS classes

Update documentation for:
- OnlineAccountClient,
- OnlineAccountClientServiceStatus,
- Department,
- FilterState,
- FilterOption,
- OptionSelectorFilter,

Update the class names & associated examples for the export JS classes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~abreu-alexandre/unity-js-scopes/fix-classnames-docs/+merge/275774/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/42/rebuild

review: Needs Fixing (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Looks good. I'm going to piggy back an update that fixes the templates as well.

review: Approve

=== modified file 'doc/docbuild/api.js'
--- doc/docbuild/api.js	2015-10-23 17:41:06 +0000
+++ doc/docbuild/api.js	2015-10-26 22:14:51 +0000
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 YUI.add("yuidoc-meta", function(Y) {
    Y.YUIDoc = { meta: {
     "classes": [
@@ -34,12 +33,17 @@
         "Category",
         "CategoryRenderer",
         "ColumnLayout",
+        "Department",
+        "FilterOption",
+        "OnlineAccountClient",
+        "OnlineAccountClientServiceStatus",
+        "OptionSelectorFilter",
         "PreviewQuery",
         "PreviewReply",
         "PreviewWidget",
         "Result",
         "Scope",
-        "SearchMetaData",
+        "SearchMetadata",
         "SearchQuery",
         "SearchReply"
     ],
@@ -54,4 +58,4 @@
         }
     ]
 } };
-});
+});
\ No newline at end of file

=== modified file 'doc/docbuild/assets/js/api-filter.js'
--- doc/docbuild/assets/js/api-filter.js	2015-10-23 17:41:06 +0000
+++ doc/docbuild/assets/js/api-filter.js	2015-10-26 22:14:51 +0000
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 YUI.add('api-filter', function (Y) {
 
 Y.APIFilter = Y.Base.create('apiFilter', Y.Base, [Y.AutoCompleteBase], {

=== modified file 'doc/docbuild/assets/js/api-list.js'
--- doc/docbuild/assets/js/api-list.js	2015-10-23 17:41:06 +0000
+++ doc/docbuild/assets/js/api-list.js	2015-10-26 22:14:51 +0000
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 YUI.add('api-list', function (Y) {
 
 var Lang   = Y.Lang,

=== modified file 'doc/docbuild/assets/js/api-search.js'
--- doc/docbuild/assets/js/api-search.js	2015-10-23 17:41:06 +0000
+++ doc/docbuild/assets/js/api-search.js	2015-10-26 22:14:51 +0000
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 YUI.add('api-search', function (Y) {
 
 var Lang   = Y.Lang,

=== modified file 'doc/docbuild/assets/js/apidocs.js'
--- doc/docbuild/assets/js/apidocs.js	2015-10-23 17:41:06 +0000
+++ doc/docbuild/assets/js/apidocs.js	2015-10-26 22:14:51 +0000
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 YUI().use(
     'yuidoc-meta',
     'api-list', 'history-hash', 'node-screen', 'node-style', 'pjax',

=== modified file 'doc/docbuild/assets/js/yui-prettify.js'
--- doc/docbuild/assets/js/yui-prettify.js	2015-10-23 17:41:06 +0000
+++ doc/docbuild/assets/js/yui-prettify.js	2015-10-26 22:14:51 +0000
@@ -24,7 +24,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 YUI().use('node', function(Y) {
     var code = Y.all('.prettyprint.linenums');
     if (code.size()) {

=== modified file 'doc/docbuild/assets/vendor/prettify/prettify-min.js'
--- doc/docbuild/assets/vendor/prettify/prettify-min.js	2015-10-23 17:41:06 +0000
+++ doc/docbuild/assets/vendor/prettify/prettify-min.js	2015-10-26 22:14:51 +0000
@@ -24,5 +24,4 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-window.PR_SHOULD_USE_CONTINUATION=true;var prettyPrintOne;var prettyPrint;(function(){var O=window;var j=["break,continue,do,else,for,if,return,while"];var v=[j,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var q=[v,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var m=[q,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var y=[q,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var T=[y,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"];var s="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes";var x=[q,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var t="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var J=[j,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var g=[j,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var I=[j,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var B=[m,T,x,t+J,g,I];var f=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;var D="str";var A="kwd";var k="com";var Q="typ";var H="lit";var M="pun";var G="pln";var n="tag";var F="dec";var K="src";var R="atn";var o="atv";var P="nocode";var N="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function l(ab){var af=0;var U=false;var ae=false;for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.ignoreCase){ae=true}else{if(/[a-z]/i.test(ag.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi,""))){U=true;ae=false;break}}}var aa={b:8,t:9,n:10,v:11,f:12,r:13};function ad(aj){var ai=aj.charCodeAt(0);if(ai!==92){return ai}var ah=aj.charAt(1);ai=aa[ah];if(ai){return ai}else{if("0"<=ah&&ah<="7"){return parseInt(aj.substring(1),8)}else{if(ah==="u"||ah==="x"){return parseInt(aj.substring(2),16)}else{return aj.charCodeAt(1)}}}}function V(ah){if(ah<32){return(ah<16?"\\x0":"\\x")+ah.toString(16)}var ai=String.fromCharCode(ah);return(ai==="\\"||ai==="-"||ai==="]"||ai==="^")?"\\"+ai:ai}function Z(an){var ar=an.substring(1,an.length-1).match(new RegExp("\\\\u[0-9A-Fa-f]{4}|\\\\x[0-9A-Fa-f]{2}|\\\\[0-3][0-7]{0,2}|\\\\[0-7]{1,2}|\\\\[\\s\\S]|-|[^-\\\\]","g"));var ah=[];var ap=ar[0]==="^";var ao=["["];if(ap){ao.push("^")}for(var at=ap?1:0,al=ar.length;at<al;++at){var aj=ar[at];if(/\\[bdsw]/i.test(aj)){ao.push(aj)}else{var ai=ad(aj);var am;if(at+2<al&&"-"===ar[at+1]){am=ad(ar[at+2]);at+=2}else{am=ai}ah.push([ai,am]);if(!(am<65||ai>122)){if(!(am<65||ai>90)){ah.push([Math.max(65,ai)|32,Math.min(am,90)|32])}if(!(am<97||ai>122)){ah.push([Math.max(97,ai)&~32,Math.min(am,122)&~32])}}}}ah.sort(function(aw,av){return(aw[0]-av[0])||(av[1]-aw[1])});var ak=[];var aq=[];for(var at=0;at<ah.length;++at){var au=ah[at];if(au[0]<=aq[1]+1){aq[1]=Math.max(aq[1],au[1])}else{ak.push(aq=au)}}for(var at=0;at<ak.length;++at){var au=ak[at];ao.push(V(au[0]));if(au[1]>au[0]){if(au[1]+1>au[0]){ao.push("-")}ao.push(V(au[1]))}}ao.push("]");return ao.join("")}function Y(an){var al=an.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var aj=al.length;var ap=[];for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah){if(ah<=ao){ap[ah]=-1}else{al[am]=V(ah)}}}}}for(var am=1;am<ap.length;++am){if(-1===ap[am]){ap[am]=++af}}for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao;if(!ap[ao]){al[am]="(?:"}}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah&&ah<=ao){al[am]="\\"+ap[ah]}}}}for(var am=0;am<aj;++am){if("^"===al[am]&&"^"!==al[am+1]){al[am]=""}}if(an.ignoreCase&&U){for(var am=0;am<aj;++am){var ai=al[am];var ak=ai.charAt(0);if(ai.length>=2&&ak==="["){al[am]=Z(ai)}else{if(ak!=="\\"){al[am]=ai.replace(/[a-zA-Z]/g,function(aq){var ar=aq.charCodeAt(0);return"["+String.fromCharCode(ar&~32,ar|32)+"]"})}}}}return al.join("")}var ac=[];for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.global||ag.multiline){throw new Error(""+ag)}ac.push("(?:"+Y(ag)+")")}return new RegExp(ac.join("|"),ae?"gi":"g")}function b(aa,Y){var W=/(?:^|\s)nocode(?:\s|$)/;var ab=[];var Z=0;var X=[];var V=0;function U(ac){switch(ac.nodeType){case 1:if(W.test(ac.className)){return}for(var af=ac.firstChild;af;af=af.nextSibling){U(af)}var ae=ac.nodeName.toLowerCase();if("br"===ae||"li"===ae){ab[V]="\n";X[V<<1]=Z++;X[(V++<<1)|1]=ac}break;case 3:case 4:var ad=ac.nodeValue;if(ad.length){if(!Y){ad=ad.replace(/[ \t\r\n]+/g," ")}else{ad=ad.replace(/\r\n?/g,"\n")}ab[V]=ad;X[V<<1]=Z;Z+=ad.length;X[(V++<<1)|1]=ac}break}}U(aa);return{sourceCode:ab.join("").replace(/\n$/,""),spans:X}}function C(U,W,Y,V){if(!W){return}var X={sourceCode:W,basePos:U};Y(X);V.push.apply(V,X.decorations)}var w=/\S/;function p(U){var X=undefined;for(var W=U.firstChild;W;W=W.nextSibling){var V=W.nodeType;X=(V===1)?(X?U:W):(V===3)?(w.test(W.nodeValue)?U:X):X}return X===U?undefined:X}function h(W,V){var U={};var X;(function(){var af=W.concat(V);var aj=[];var ai={};for(var ad=0,ab=af.length;ad<ab;++ad){var aa=af[ad];var ae=aa[3];if(ae){for(var ag=ae.length;--ag>=0;){U[ae.charAt(ag)]=aa}}var ah=aa[1];var ac=""+ah;if(!ai.hasOwnProperty(ac)){aj.push(ah);ai[ac]=null}}aj.push(/[\0-\uffff]/);X=l(aj)})();var Z=V.length;var Y=function(aj){var ab=aj.sourceCode,aa=aj.basePos;var af=[aa,G];var ah=0;var ap=ab.match(X)||[];var al={};for(var ag=0,at=ap.length;ag<at;++ag){var ai=ap[ag];var ar=al[ai];var ak=void 0;var ao;if(typeof ar==="string"){ao=false}else{var ac=U[ai.charAt(0)];if(ac){ak=ai.match(ac[1]);ar=ac[0]}else{for(var aq=0;aq<Z;++aq){ac=V[aq];ak=ai.match(ac[1]);if(ak){ar=ac[0];break}}if(!ak){ar=G}}ao=ar.length>=5&&"lang-"===ar.substring(0,5);if(ao&&!(ak&&typeof ak[1]==="string")){ao=false;ar=K}if(!ao){al[ai]=ar}}var ad=ah;ah+=ai.length;if(!ao){af.push(aa+ad,ar)}else{var an=ak[1];var am=ai.indexOf(an);var ae=am+an.length;if(ak[2]){ae=ai.length-ak[2].length;am=ae-an.length}var au=ar.substring(5);C(aa+ad,ai.substring(0,am),Y,af);C(aa+ad+am,an,r(au,an),af);C(aa+ad+ae,ai.substring(ae),Y,af)}}aj.decorations=af};return Y}function i(V){var Y=[],U=[];if(V.tripleQuotedStrings){Y.push([D,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(V.multiLineStrings){Y.push([D,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{Y.push([D,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(V.verbatimStrings){U.push([D,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var ab=V.hashComments;if(ab){if(V.cStyleComments){if(ab>1){Y.push([k,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{Y.push([k,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}U.push([D,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])}else{Y.push([k,/^#[^\r\n]*/,null,"#"])}}if(V.cStyleComments){U.push([k,/^\/\/[^\r\n]*/,null]);U.push([k,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(V.regexLiterals){var aa=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");U.push(["lang-regex",new RegExp("^"+N+"("+aa+")")])}var X=V.types;if(X){U.push([Q,X])}var W=(""+V.keywords).replace(/^ | $/g,"");if(W.length){U.push([A,new RegExp("^(?:"+W.replace(/[\s,]+/g,"|")+")\\b"),null])}Y.push([G,/^\s+/,null," \r\n\t\xA0"]);var Z=/^.[^\s\w\.$@\'\"\`\/\\]*/;U.push([H,/^@[a-z_$][a-z_$@0-9]*/i,null],[Q,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[G,/^[a-z_$][a-z_$@0-9]*/i,null],[H,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[G,/^\\[\s\S]?/,null],[M,Z,null]);return h(Y,U)}var L=i({keywords:B,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function S(W,ah,aa){var V=/(?:^|\s)nocode(?:\s|$)/;var ac=/\r\n?|\n/;var ad=W.ownerDocument;var ag=ad.createElement("li");while(W.firstChild){ag.appendChild(W.firstChild)}var X=[ag];function af(am){switch(am.nodeType){case 1:if(V.test(am.className)){break}if("br"===am.nodeName){ae(am);if(am.parentNode){am.parentNode.removeChild(am)}}else{for(var ao=am.firstChild;ao;ao=ao.nextSibling){af(ao)}}break;case 3:case 4:if(aa){var an=am.nodeValue;var ak=an.match(ac);if(ak){var aj=an.substring(0,ak.index);am.nodeValue=aj;var ai=an.substring(ak.index+ak[0].length);if(ai){var al=am.parentNode;al.insertBefore(ad.createTextNode(ai),am.nextSibling)}ae(am);if(!aj){am.parentNode.removeChild(am)}}}break}}function ae(al){while(!al.nextSibling){al=al.parentNode;if(!al){return}}function aj(am,at){var ar=at?am.cloneNode(false):am;var ap=am.parentNode;if(ap){var aq=aj(ap,1);var ao=am.nextSibling;aq.appendChild(ar);for(var an=ao;an;an=ao){ao=an.nextSibling;aq.appendChild(an)}}return ar}var ai=aj(al.nextSibling,0);for(var ak;(ak=ai.parentNode)&&ak.nodeType===1;){ai=ak}X.push(ai)}for(var Z=0;Z<X.length;++Z){af(X[Z])}if(ah===(ah|0)){X[0].setAttribute("value",ah)}var ab=ad.createElement("ol");ab.className="linenums";var Y=Math.max(0,((ah-1))|0)||0;for(var Z=0,U=X.length;Z<U;++Z){ag=X[Z];ag.className="L"+((Z+Y)%10);if(!ag.firstChild){ag.appendChild(ad.createTextNode("\xA0"))}ab.appendChild(ag)}W.appendChild(ab)}function E(af){var X=/\bMSIE\s(\d+)/.exec(navigator.userAgent);X=X&&+X[1]<=8;var ao=/\n/g;var an=af.sourceCode;var ap=an.length;var Y=0;var ad=af.spans;var V=ad.length;var aj=0;var aa=af.decorations;var ab=aa.length;var ac=0;aa[ab]=ap;var av,at;for(at=av=0;at<ab;){if(aa[at]!==aa[at+2]){aa[av++]=aa[at++];aa[av++]=aa[at++]}else{at+=2}}ab=av;for(at=av=0;at<ab;){var aw=aa[at];var ae=aa[at+1];var Z=at+2;while(Z+2<=ab&&aa[Z+1]===ae){Z+=2}aa[av++]=aw;aa[av++]=ae;at=Z}ab=aa.length=av;var au=af.sourceNode;var ak;if(au){ak=au.style.display;au.style.display="none"}try{var ah=null;while(aj<V){var ai=ad[aj];var U=ad[aj+2]||ap;var ar=aa[ac+2]||ap;var Z=Math.min(U,ar);var am=ad[aj+1];var W;if(am.nodeType!==1&&(W=an.substring(Y,Z))){if(X){W=W.replace(ao,"\r")}am.nodeValue=W;var al=am.ownerDocument;var aq=al.createElement("span");aq.className=aa[ac+1];var ag=am.parentNode;ag.replaceChild(aq,am);aq.appendChild(am);if(Y<U){ad[aj+1]=am=al.createTextNode(an.substring(Z,U));ag.insertBefore(am,aq.nextSibling)}}Y=Z;if(Y>=U){aj+=2}if(Y>=ar){ac+=2}}}finally{if(au){au.style.display=ak}}}var u={};function d(W,X){for(var U=X.length;--U>=0;){var V=X[U];if(!u.hasOwnProperty(V)){u[V]=W}else{if(O.console){console.warn("cannot override language handler %s",V)}}}}function r(V,U){if(!(V&&u.hasOwnProperty(V))){V=/^\s*</.test(U)?"default-markup":"default-code"}return u[V]}d(L,["default-code"]);d(h([],[[G,/^[^<?]+/],[F,/^<!\w[^>]*(?:>|$)/],[k,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[M,/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);d(h([[G,/^[\s]+/,null," \t\r\n"],[o,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[n,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[R,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[M,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);d(h([],[[o,/^[\s\S]+/]]),["uq.val"]);d(i({keywords:m,hashComments:true,cStyleComments:true,types:f}),["c","cc","cpp","cxx","cyc","m"]);d(i({keywords:"null,true,false"}),["json"]);d(i({keywords:T,hashComments:true,cStyleComments:true,verbatimStrings:true,types:f}),["cs"]);d(i({keywords:y,cStyleComments:true}),["java"]);d(i({keywords:I,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);d(i({keywords:J,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);d(i({keywords:t,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);d(i({keywords:g,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);d(i({keywords:x,cStyleComments:true,regexLiterals:true}),["js"]);d(i({keywords:s,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);d(h([],[[D,/^[\s\S]+/]]),["regex"]);function e(X){var W=X.langExtension;try{var U=b(X.sourceNode,X.pre);var V=U.sourceCode;X.sourceCode=V;X.spans=U.spans;X.basePos=0;r(W,V)(X);E(X)}catch(Y){if(O.console){console.log(Y&&Y.stack?Y.stack:Y)}}}function z(Y,X,W){var U=document.createElement("pre");U.innerHTML=Y;if(W){S(U,W,true)}var V={langExtension:X,numberLines:W,sourceNode:U,pre:1};e(V);return U.innerHTML}function c(aj){function ab(al){return document.getElementsByTagName(al)}var ah=[ab("pre"),ab("code"),ab("xmp")];var V=[];for(var ae=0;ae<ah.length;++ae){for(var ac=0,Y=ah[ae].length;ac<Y;++ac){V.push(ah[ae][ac])}}ah=null;var Z=Date;if(!Z.now){Z={now:function(){return +(new Date)}}}var aa=0;var U;var af=/\blang(?:uage)?-([\w.]+)(?!\S)/;var ak=/\bprettyprint\b/;var W=/\bprettyprinted\b/;var ag=/pre|xmp/i;var ai=/^code$/i;var ad=/^(?:pre|code|xmp)$/i;function X(){var ar=(O.PR_SHOULD_USE_CONTINUATION?Z.now()+250:Infinity);for(;aa<V.length&&Z.now()<ar;aa++){var at=V[aa];var au=at.className;if(ak.test(au)&&!W.test(au)){var aw=false;for(var ao=at.parentNode;ao;ao=ao.parentNode){var ax=ao.tagName;if(ad.test(ax)&&ao.className&&ak.test(ao.className)){aw=true;break}}if(!aw){at.className+=" prettyprinted";var aq=au.match(af);var am;if(!aq&&(am=p(at))&&ai.test(am.tagName)){aq=am.className.match(af)}if(aq){aq=aq[1]}var ap;if(ag.test(at.tagName)){ap=1}else{var an=at.currentStyle;var al=(an?an.whiteSpace:(document.defaultView&&document.defaultView.getComputedStyle)?document.defaultView.getComputedStyle(at,null).getPropertyValue("white-space"):0);ap=al&&"pre"===al.substring(0,3)}var av=at.className.match(/\blinenums\b(?::(\d+))?/);av=av?av[1]&&av[1].length?+av[1]:true:false;if(av){S(at,av,ap)}U={langExtension:aq,sourceNode:at,numberLines:av,pre:ap};e(U)}}}if(aa<V.length){setTimeout(X,250)}else{if(aj){aj()}}}X()}var a=O.PR={createSimpleLexer:h,registerLangHandler:d,sourceDecorator:i,PR_ATTRIB_NAME:R,PR_ATTRIB_VALUE:o,PR_COMMENT:k,PR_DECLARATION:F,PR_KEYWORD:A,PR_LITERAL:H,PR_NOCODE:P,PR_PLAIN:G,PR_PUNCTUATION:M,PR_SOURCE:K,PR_STRING:D,PR_TAG:n,PR_TYPE:Q,prettyPrintOne:O.prettyPrintOne=z,prettyPrint:O.prettyPrint=c};if(typeof define==="function"&&define.amd){define("google-code-prettify",[],function(){return a})}})();PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_DECLARATION,/^<!\w[^>]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^<script\b[^>]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:<!--|-->)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]);
+window.PR_SHOULD_USE_CONTINUATION=true;var prettyPrintOne;var prettyPrint;(function(){var O=window;var j=["break,continue,do,else,for,if,return,while"];var v=[j,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var q=[v,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var m=[q,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var y=[q,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var T=[y,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"];var s="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes";var x=[q,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var t="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var J=[j,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var g=[j,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var I=[j,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var B=[m,T,x,t+J,g,I];var f=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/;var D="str";var A="kwd";var k="com";var Q="typ";var H="lit";var M="pun";var G="pln";var n="tag";var F="dec";var K="src";var R="atn";var o="atv";var P="nocode";var N="(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function l(ab){var af=0;var U=false;var ae=false;for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.ignoreCase){ae=true}else{if(/[a-z]/i.test(ag.source.replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\[^ux]/gi,""))){U=true;ae=false;break}}}var aa={b:8,t:9,n:10,v:11,f:12,r:13};function ad(aj){var ai=aj.charCodeAt(0);if(ai!==92){return ai}var ah=aj.charAt(1);ai=aa[ah];if(ai){return ai}else{if("0"<=ah&&ah<="7"){return parseInt(aj.substring(1),8)}else{if(ah==="u"||ah==="x"){return parseInt(aj.substring(2),16)}else{return aj.charCodeAt(1)}}}}function V(ah){if(ah<32){return(ah<16?"\\x0":"\\x")+ah.toString(16)}var ai=String.fromCharCode(ah);return(ai==="\\"||ai==="-"||ai==="]"||ai==="^")?"\\"+ai:ai}function Z(an){var ar=an.substring(1,an.length-1).match(new RegExp("\\\\u[0-9A-Fa-f]{4}|\\\\x[0-9A-Fa-f]{2}|\\\\[0-3][0-7]{0,2}|\\\\[0-7]{1,2}|\\\\[\\s\\S]|-|[^-\\\\]","g"));var ah=[];var ap=ar[0]==="^";var ao=["["];if(ap){ao.push("^")}for(var at=ap?1:0,al=ar.length;at<al;++at){var aj=ar[at];if(/\\[bdsw]/i.test(aj)){ao.push(aj)}else{var ai=ad(aj);var am;if(at+2<al&&"-"===ar[at+1]){am=ad(ar[at+2]);at+=2}else{am=ai}ah.push([ai,am]);if(!(am<65||ai>122)){if(!(am<65||ai>90)){ah.push([Math.max(65,ai)|32,Math.min(am,90)|32])}if(!(am<97||ai>122)){ah.push([Math.max(97,ai)&~32,Math.min(am,122)&~32])}}}}ah.sort(function(aw,av){return(aw[0]-av[0])||(av[1]-aw[1])});var ak=[];var aq=[];for(var at=0;at<ah.length;++at){var au=ah[at];if(au[0]<=aq[1]+1){aq[1]=Math.max(aq[1],au[1])}else{ak.push(aq=au)}}for(var at=0;at<ak.length;++at){var au=ak[at];ao.push(V(au[0]));if(au[1]>au[0]){if(au[1]+1>au[0]){ao.push("-")}ao.push(V(au[1]))}}ao.push("]");return ao.join("")}function Y(an){var al=an.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var aj=al.length;var ap=[];for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah){if(ah<=ao){ap[ah]=-1}else{al[am]=V(ah)}}}}}for(var am=1;am<ap.length;++am){if(-1===ap[am]){ap[am]=++af}}for(var am=0,ao=0;am<aj;++am){var ai=al[am];if(ai==="("){++ao;if(!ap[ao]){al[am]="(?:"}}else{if("\\"===ai.charAt(0)){var ah=+ai.substring(1);if(ah&&ah<=ao){al[am]="\\"+ap[ah]}}}}for(var am=0;am<aj;++am){if("^"===al[am]&&"^"!==al[am+1]){al[am]=""}}if(an.ignoreCase&&U){for(var am=0;am<aj;++am){var ai=al[am];var ak=ai.charAt(0);if(ai.length>=2&&ak==="["){al[am]=Z(ai)}else{if(ak!=="\\"){al[am]=ai.replace(/[a-zA-Z]/g,function(aq){var ar=aq.charCodeAt(0);return"["+String.fromCharCode(ar&~32,ar|32)+"]"})}}}}return al.join("")}var ac=[];for(var X=0,W=ab.length;X<W;++X){var ag=ab[X];if(ag.global||ag.multiline){throw new Error(""+ag)}ac.push("(?:"+Y(ag)+")")}return new RegExp(ac.join("|"),ae?"gi":"g")}function b(aa,Y){var W=/(?:^|\s)nocode(?:\s|$)/;var ab=[];var Z=0;var X=[];var V=0;function U(ac){switch(ac.nodeType){case 1:if(W.test(ac.className)){return}for(var af=ac.firstChild;af;af=af.nextSibling){U(af)}var ae=ac.nodeName.toLowerCase();if("br"===ae||"li"===ae){ab[V]="\n";X[V<<1]=Z++;X[(V++<<1)|1]=ac}break;case 3:case 4:var ad=ac.nodeValue;if(ad.length){if(!Y){ad=ad.replace(/[ \t\r\n]+/g," ")}else{ad=ad.replace(/\r\n?/g,"\n")}ab[V]=ad;X[V<<1]=Z;Z+=ad.length;X[(V++<<1)|1]=ac}break}}U(aa);return{sourceCode:ab.join("").replace(/\n$/,""),spans:X}}function C(U,W,Y,V){if(!W){return}var X={sourceCode:W,basePos:U};Y(X);V.push.apply(V,X.decorations)}var w=/\S/;function p(U){var X=undefined;for(var W=U.firstChild;W;W=W.nextSibling){var V=W.nodeType;X=(V===1)?(X?U:W):(V===3)?(w.test(W.nodeValue)?U:X):X}return X===U?undefined:X}function h(W,V){var U={};var X;(function(){var af=W.concat(V);var aj=[];var ai={};for(var ad=0,ab=af.length;ad<ab;++ad){var aa=af[ad];var ae=aa[3];if(ae){for(var ag=ae.length;--ag>=0;){U[ae.charAt(ag)]=aa}}var ah=aa[1];var ac=""+ah;if(!ai.hasOwnProperty(ac)){aj.push(ah);ai[ac]=null}}aj.push(/[\0-\uffff]/);X=l(aj)})();var Z=V.length;var Y=function(aj){var ab=aj.sourceCode,aa=aj.basePos;var af=[aa,G];var ah=0;var ap=ab.match(X)||[];var al={};for(var ag=0,at=ap.length;ag<at;++ag){var ai=ap[ag];var ar=al[ai];var ak=void 0;var ao;if(typeof ar==="string"){ao=false}else{var ac=U[ai.charAt(0)];if(ac){ak=ai.match(ac[1]);ar=ac[0]}else{for(var aq=0;aq<Z;++aq){ac=V[aq];ak=ai.match(ac[1]);if(ak){ar=ac[0];break}}if(!ak){ar=G}}ao=ar.length>=5&&"lang-"===ar.substring(0,5);if(ao&&!(ak&&typeof ak[1]==="string")){ao=false;ar=K}if(!ao){al[ai]=ar}}var ad=ah;ah+=ai.length;if(!ao){af.push(aa+ad,ar)}else{var an=ak[1];var am=ai.indexOf(an);var ae=am+an.length;if(ak[2]){ae=ai.length-ak[2].length;am=ae-an.length}var au=ar.substring(5);C(aa+ad,ai.substring(0,am),Y,af);C(aa+ad+am,an,r(au,an),af);C(aa+ad+ae,ai.substring(ae),Y,af)}}aj.decorations=af};return Y}function i(V){var Y=[],U=[];if(V.tripleQuotedStrings){Y.push([D,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(V.multiLineStrings){Y.push([D,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{Y.push([D,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(V.verbatimStrings){U.push([D,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var ab=V.hashComments;if(ab){if(V.cStyleComments){if(ab>1){Y.push([k,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{Y.push([k,/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}U.push([D,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,null])}else{Y.push([k,/^#[^\r\n]*/,null,"#"])}}if(V.cStyleComments){U.push([k,/^\/\/[^\r\n]*/,null]);U.push([k,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(V.regexLiterals){var aa=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");U.push(["lang-regex",new RegExp("^"+N+"("+aa+")")])}var X=V.types;if(X){U.push([Q,X])}var W=(""+V.keywords).replace(/^ | $/g,"");if(W.length){U.push([A,new RegExp("^(?:"+W.replace(/[\s,]+/g,"|")+")\\b"),null])}Y.push([G,/^\s+/,null," \r\n\t\xA0"]);var Z=/^.[^\s\w\.$@\'\"\`\/\\]*/;U.push([H,/^@[a-z_$][a-z_$@0-9]*/i,null],[Q,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[G,/^[a-z_$][a-z_$@0-9]*/i,null],[H,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[G,/^\\[\s\S]?/,null],[M,Z,null]);return h(Y,U)}var L=i({keywords:B,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function S(W,ah,aa){var V=/(?:^|\s)nocode(?:\s|$)/;var ac=/\r\n?|\n/;var ad=W.ownerDocument;var ag=ad.createElement("li");while(W.firstChild){ag.appendChild(W.firstChild)}var X=[ag];function af(am){switch(am.nodeType){case 1:if(V.test(am.className)){break}if("br"===am.nodeName){ae(am);if(am.parentNode){am.parentNode.removeChild(am)}}else{for(var ao=am.firstChild;ao;ao=ao.nextSibling){af(ao)}}break;case 3:case 4:if(aa){var an=am.nodeValue;var ak=an.match(ac);if(ak){var aj=an.substring(0,ak.index);am.nodeValue=aj;var ai=an.substring(ak.index+ak[0].length);if(ai){var al=am.parentNode;al.insertBefore(ad.createTextNode(ai),am.nextSibling)}ae(am);if(!aj){am.parentNode.removeChild(am)}}}break}}function ae(al){while(!al.nextSibling){al=al.parentNode;if(!al){return}}function aj(am,at){var ar=at?am.cloneNode(false):am;var ap=am.parentNode;if(ap){var aq=aj(ap,1);var ao=am.nextSibling;aq.appendChild(ar);for(var an=ao;an;an=ao){ao=an.nextSibling;aq.appendChild(an)}}return ar}var ai=aj(al.nextSibling,0);for(var ak;(ak=ai.parentNode)&&ak.nodeType===1;){ai=ak}X.push(ai)}for(var Z=0;Z<X.length;++Z){af(X[Z])}if(ah===(ah|0)){X[0].setAttribute("value",ah)}var ab=ad.createElement("ol");ab.className="linenums";var Y=Math.max(0,((ah-1))|0)||0;for(var Z=0,U=X.length;Z<U;++Z){ag=X[Z];ag.className="L"+((Z+Y)%10);if(!ag.firstChild){ag.appendChild(ad.createTextNode("\xA0"))}ab.appendChild(ag)}W.appendChild(ab)}function E(af){var X=/\bMSIE\s(\d+)/.exec(navigator.userAgent);X=X&&+X[1]<=8;var ao=/\n/g;var an=af.sourceCode;var ap=an.length;var Y=0;var ad=af.spans;var V=ad.length;var aj=0;var aa=af.decorations;var ab=aa.length;var ac=0;aa[ab]=ap;var av,at;for(at=av=0;at<ab;){if(aa[at]!==aa[at+2]){aa[av++]=aa[at++];aa[av++]=aa[at++]}else{at+=2}}ab=av;for(at=av=0;at<ab;){var aw=aa[at];var ae=aa[at+1];var Z=at+2;while(Z+2<=ab&&aa[Z+1]===ae){Z+=2}aa[av++]=aw;aa[av++]=ae;at=Z}ab=aa.length=av;var au=af.sourceNode;var ak;if(au){ak=au.style.display;au.style.display="none"}try{var ah=null;while(aj<V){var ai=ad[aj];var U=ad[aj+2]||ap;var ar=aa[ac+2]||ap;var Z=Math.min(U,ar);var am=ad[aj+1];var W;if(am.nodeType!==1&&(W=an.substring(Y,Z))){if(X){W=W.replace(ao,"\r")}am.nodeValue=W;var al=am.ownerDocument;var aq=al.createElement("span");aq.className=aa[ac+1];var ag=am.parentNode;ag.replaceChild(aq,am);aq.appendChild(am);if(Y<U){ad[aj+1]=am=al.createTextNode(an.substring(Z,U));ag.insertBefore(am,aq.nextSibling)}}Y=Z;if(Y>=U){aj+=2}if(Y>=ar){ac+=2}}}finally{if(au){au.style.display=ak}}}var u={};function d(W,X){for(var U=X.length;--U>=0;){var V=X[U];if(!u.hasOwnProperty(V)){u[V]=W}else{if(O.console){console.warn("cannot override language handler %s",V)}}}}function r(V,U){if(!(V&&u.hasOwnProperty(V))){V=/^\s*</.test(U)?"default-markup":"default-code"}return u[V]}d(L,["default-code"]);d(h([],[[G,/^[^<?]+/],[F,/^<!\w[^>]*(?:>|$)/],[k,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[M,/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);d(h([[G,/^[\s]+/,null," \t\r\n"],[o,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[n,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[R,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[M,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);d(h([],[[o,/^[\s\S]+/]]),["uq.val"]);d(i({keywords:m,hashComments:true,cStyleComments:true,types:f}),["c","cc","cpp","cxx","cyc","m"]);d(i({keywords:"null,true,false"}),["json"]);d(i({keywords:T,hashComments:true,cStyleComments:true,verbatimStrings:true,types:f}),["cs"]);d(i({keywords:y,cStyleComments:true}),["java"]);d(i({keywords:I,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);d(i({keywords:J,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);d(i({keywords:t,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);d(i({keywords:g,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);d(i({keywords:x,cStyleComments:true,regexLiterals:true}),["js"]);d(i({keywords:s,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);d(h([],[[D,/^[\s\S]+/]]),["regex"]);function e(X){var W=X.langExtension;try{var U=b(X.sourceNode,X.pre);var V=U.sourceCode;X.sourceCode=V;X.spans=U.spans;X.basePos=0;r(W,V)(X);E(X)}catch(Y){if(O.console){console.log(Y&&Y.stack?Y.stack:Y)}}}function z(Y,X,W){var U=document.createElement("pre");U.innerHTML=Y;if(W){S(U,W,true)}var V={langExtension:X,numberLines:W,sourceNode:U,pre:1};e(V);return U.innerHTML}function c(aj){function ab(al){return document.getElementsByTagName(al)}var ah=[ab("pre"),ab("code"),ab("xmp")];var V=[];for(var ae=0;ae<ah.length;++ae){for(var ac=0,Y=ah[ae].length;ac<Y;++ac){V.push(ah[ae][ac])}}ah=null;var Z=Date;if(!Z.now){Z={now:function(){return +(new Date)}}}var aa=0;var U;var af=/\blang(?:uage)?-([\w.]+)(?!\S)/;var ak=/\bprettyprint\b/;var W=/\bprettyprinted\b/;var ag=/pre|xmp/i;var ai=/^code$/i;var ad=/^(?:pre|code|xmp)$/i;function X(){var ar=(O.PR_SHOULD_USE_CONTINUATION?Z.now()+250:Infinity);for(;aa<V.length&&Z.now()<ar;aa++){var at=V[aa];var au=at.className;if(ak.test(au)&&!W.test(au)){var aw=false;for(var ao=at.parentNode;ao;ao=ao.parentNode){var ax=ao.tagName;if(ad.test(ax)&&ao.className&&ak.test(ao.className)){aw=true;break}}if(!aw){at.className+=" prettyprinted";var aq=au.match(af);var am;if(!aq&&(am=p(at))&&ai.test(am.tagName)){aq=am.className.match(af)}if(aq){aq=aq[1]}var ap;if(ag.test(at.tagName)){ap=1}else{var an=at.currentStyle;var al=(an?an.whiteSpace:(document.defaultView&&document.defaultView.getComputedStyle)?document.defaultView.getComputedStyle(at,null).getPropertyValue("white-space"):0);ap=al&&"pre"===al.substring(0,3)}var av=at.className.match(/\blinenums\b(?::(\d+))?/);av=av?av[1]&&av[1].length?+av[1]:true:false;if(av){S(at,av,ap)}U={langExtension:aq,sourceNode:at,numberLines:av,pre:ap};e(U)}}}if(aa<V.length){setTimeout(X,250)}else{if(aj){aj()}}}X()}var a=O.PR={createSimpleLexer:h,registerLangHandler:d,sourceDecorator:i,PR_ATTRIB_NAME:R,PR_ATTRIB_VALUE:o,PR_COMMENT:k,PR_DECLARATION:F,PR_KEYWORD:A,PR_LITERAL:H,PR_NOCODE:P,PR_PLAIN:G,PR_PUNCTUATION:M,PR_SOURCE:K,PR_STRING:D,PR_TAG:n,PR_TYPE:Q,prettyPrintOne:O.prettyPrintOne=z,prettyPrint:O.prettyPrint=c};if(typeof define==="function"&&define.amd){define("google-code-prettify",[],function(){return a})}})();PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_DECLARATION,/^<!\w[^>]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^<xmp\b[^>]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^<script\b[^>]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^<script\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:<!--|-->)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]);
\ No newline at end of file

=== modified file 'doc/docbuild/classes/ActionMetadata.html'
--- doc/docbuild/classes/ActionMetadata.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/ActionMetadata.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/ActivationQuery.html'
--- doc/docbuild/classes/ActivationQuery.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/ActivationQuery.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/CategorisedResult.html'
--- doc/docbuild/classes/CategorisedResult.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/CategorisedResult.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/Category.html'
--- doc/docbuild/classes/Category.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/Category.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/CategoryRenderer.html'
--- doc/docbuild/classes/CategoryRenderer.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/CategoryRenderer.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/ColumnLayout.html'
--- doc/docbuild/classes/ColumnLayout.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/ColumnLayout.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/PreviewQuery.html'
--- doc/docbuild/classes/PreviewQuery.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/PreviewQuery.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/PreviewReply.html'
--- doc/docbuild/classes/PreviewReply.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/PreviewReply.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/PreviewWidget.html'
--- doc/docbuild/classes/PreviewWidget.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/PreviewWidget.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/Result.html'
--- doc/docbuild/classes/Result.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/Result.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/Scope.html'
--- doc/docbuild/classes/Scope.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/Scope.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== removed file 'doc/docbuild/classes/SearchMetaData.html'
--- doc/docbuild/classes/SearchMetaData.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/SearchMetaData.html	1970-01-01 00:00:00 +0000
@@ -1,1130 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>SearchMetaData - Javascript Scopes API</title>
-    <link rel="stylesheet" href="http://yui.yahooapis.com/3.9.1/build/cssgrids/cssgrids-min.css">
-    <link rel="stylesheet" href="../assets/vendor/prettify/prettify-min.css">
-    <link rel="stylesheet" href="../assets/css/main.css" id="site_styles">
-    <link rel="icon" href="../assets/favicon.ico">
-    <script src="http://yui.yahooapis.com/combo?3.9.1/build/yui/yui-min.js"></script>
-</head>
-<body class="yui3-skin-sam">
-
-<div id="doc">
-    <div id="hd" class="yui3-g header">
-        <div class="yui3-u-3-4">
-                <h1><img src="../assets/css/logo.png" title="Javascript Scopes API" width="117" height="52"></h1>
-        </div>
-        <div class="yui3-u-1-4 version">
-            <em>API Docs for: 0.1</em>
-        </div>
-    </div>
-    <div id="bd" class="yui3-g">
-
-        <div class="yui3-u-1-4">
-            <div id="docs-sidebar" class="sidebar apidocs">
-                <div id="api-list">
-                    <h2 class="off-left">APIs</h2>
-                    <div id="api-tabview" class="tabview">
-                        <ul class="tabs">
-                            <li><a href="#api-classes">Classes</a></li>
-                            <li><a href="#api-modules">Modules</a></li>
-                        </ul>
-                
-                        <div id="api-tabview-filter">
-                            <input type="search" id="api-filter" placeholder="Type to filter APIs">
-                        </div>
-                
-                        <div id="api-tabview-panel">
-                            <ul id="api-classes" class="apis classes">
-                                <li><a href="../classes/ActionMetadata.html">ActionMetadata</a></li>
-                                <li><a href="../classes/ActivationQuery.html">ActivationQuery</a></li>
-                                <li><a href="../classes/CategorisedResult.html">CategorisedResult</a></li>
-                                <li><a href="../classes/Category.html">Category</a></li>
-                                <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
-                                <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
-                                <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
-                                <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
-                                <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
-                                <li><a href="../classes/Result.html">Result</a></li>
-                                <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
-                                <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
-                                <li><a href="../classes/SearchReply.html">SearchReply</a></li>
-                            </ul>
-                
-                            <ul id="api-modules" class="apis modules">
-                                <li><a href="../modules/ScopeJS.html">ScopeJS</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="yui3-u-3-4">
-                <div id="api-options">
-                    Show:
-                    <label for="api-show-inherited">
-                        <input type="checkbox" id="api-show-inherited" checked>
-                        Inherited
-                    </label>
-            
-                    <label for="api-show-protected">
-                        <input type="checkbox" id="api-show-protected">
-                        Protected
-                    </label>
-            
-                    <label for="api-show-private">
-                        <input type="checkbox" id="api-show-private">
-                        Private
-                    </label>
-                    <label for="api-show-deprecated">
-                        <input type="checkbox" id="api-show-deprecated">
-                        Deprecated
-                    </label>
-            
-                </div>
-            
-            <div class="apidocs">
-                <div id="docs-main">
-                    <div class="content">
-<h1>SearchMetaData Class</h1>
-<div class="box meta">
-
-
-        <div class="foundat">
-            Defined in: <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l1"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:1</code></a>
-        </div>
-
-            Module: <a href="../modules/ScopeJS.html">ScopeJS</a>
-
-</div>
-
-
-<div class="box intro">
-    <p>Metadata passed with search requests.
-Two forms of construction are allowed depending on the number
-and types of the parameters:</p>
-<ul>
-<li>with locale and form factor
-or</li>
-<li>with cardinality, locale, and form factor.</li>
-</ul>
-
-</div>
-
-
-<div id="classdocs" class="tabview">
-    <ul class="api-class-tabs">
-        <li class="api-class-tab index"><a href="#index">Index</a></li>
-
-            <li class="api-class-tab methods"><a href="#methods">Methods</a></li>
-    </ul>
-
-    <div>
-        <div id="index" class="api-class-tabpanel index">
-            <h2 class="off-left">Item Index</h2>
-
-                <div class="index-section methods">
-                    <h3>Methods</h3>
-
-                    <ul class="index-list methods">
-                            <li class="index-item method">
-                                <a href="#method_aggregated_keywords">aggregated_keywords</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_cardinality">cardinality</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_contains_hint">contains_hint</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_form_factor">form_factor</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_get">get</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_has_location">has_location</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_hints">hints</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_internet_connectivity">internet_connectivity</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_is_aggregated">is_aggregated</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_locale">locale</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_location">location</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_remove_location">remove_location</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_set">set</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_set_aggregated_keywords">set_aggregated_keywords</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_set_cardinality">set_cardinality</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_set_hint">set_hint</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_set_internet_connectivity">set_internet_connectivity</a>
-
-                            </li>
-                            <li class="index-item method">
-                                <a href="#method_set_location">set_location</a>
-
-                            </li>
-                    </ul>
-                </div>
-
-
-
-        </div>
-
-            <div id="methods" class="api-class-tabpanel">
-                <h2 class="off-left">Methods</h2>
-
-<div id="method_aggregated_keywords" class="method item">
-    <h3 class="name"><code>aggregated_keywords</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type">Array of String</span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l71"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:71</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Get the list of scope keywords used to initiate this search request.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Array of String</span>:
-                    <p>The list of scope keywords used to initiate this search request.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_cardinality" class="method item">
-    <h3 class="name"><code>cardinality</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type">Int</span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l29"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:29</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Get cardinality.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Int</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_contains_hint" class="method item">
-    <h3 class="name"><code>contains_hint</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>key</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l100"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:100</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Check if this SearchMetadata has a hint.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">key</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The hint name.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p>True if the hint is set.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_form_factor" class="method item">
-    <h3 class="name"><code>form_factor</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type"></span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l124"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:124</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Get the form factor string.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                    <p>The form factor string</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_get" class="method item">
-    <h3 class="name"><code>get</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>key</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-        <span class="returns-inline">
-            <span class="type">String</span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l116"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:116</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Get the value of an attribute</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">key</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                         
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">String</span>:
-                    <p>, {Number} or {Object}</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_has_location" class="method item">
-    <h3 class="name"><code>has_location</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l50"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:50</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Does the SearchMetadata have a location.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p>True if there is a location property.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_hints" class="method item">
-    <h3 class="name"><code>hints</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type">Dictionary</span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l93"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:93</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Get all hints.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Dictionary</span>:
-            </div>
-        </div>
-
-
-</div>
-<div id="method_internet_connectivity" class="method item">
-    <h3 class="name"><code>internet_connectivity</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type">ConnectivityStatus</span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l138"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:138</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Get internet connectivity status.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">ConnectivityStatus</span>:
-                    <p>The internet connectivity status.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_is_aggregated" class="method item">
-    <h3 class="name"><code>is_aggregated</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type">Boolean</span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l78"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:78</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Check if this search request originated from an aggregator scope.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Boolean</span>:
-                    <p>True if this search request originated from an aggregator scope.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_locale" class="method item">
-    <h3 class="name"><code>locale</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type"></span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l131"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:131</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Get the locale string.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                    <p>The locale string</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_location" class="method item">
-    <h3 class="name"><code>location</code></h3>
-
-        <span class="paren">()</span>
-
-        <span class="returns-inline">
-            <span class="type">Location</span>
-        </span>
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l43"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:43</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Get location.</p>
-
-    </div>
-
-
-        <div class="returns">
-            <h4>Returns:</h4>
-
-            <div class="returns-description">
-                        <span class="type">Location</span>:
-                    <p>data representing the current location, including attributes such as city and country.</p>
-
-            </div>
-        </div>
-
-
-</div>
-<div id="method_remove_location" class="method item">
-    <h3 class="name"><code>remove_location</code></h3>
-
-        <span class="paren">()</span>
-
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l57"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:57</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Remove location data entirely.
-This method does nothing if no location data is present.</p>
-
-    </div>
-
-
-
-
-</div>
-<div id="method_set" class="method item">
-    <h3 class="name"><code>set</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>key</code>
-                </li>
-                <li class="arg">
-                        <code>value</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l108"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:108</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Set the value of an attribute</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">key</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                         
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">value</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>, {Number} or {Object}</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_set_aggregated_keywords" class="method item">
-    <h3 class="name"><code>set_aggregated_keywords</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>aggregated_keywords</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l64"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:64</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Set the list of scope keywords used to initiate this search request.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">aggregated_keywords</code>
-                        <span class="type">Array of String</span>
-
-
-                    <div class="param-description">
-                        <p>The list of scope keywords used to initiate this search request.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_set_cardinality" class="method item">
-    <h3 class="name"><code>set_cardinality</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>cardinality</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l22"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:22</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Set cardinality.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">cardinality</code>
-                        <span class="type">Int</span>
-
-
-                    <div class="param-description">
-                         
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_set_hint" class="method item">
-    <h3 class="name"><code>set_hint</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>key</code>
-                </li>
-                <li class="arg">
-                        <code>value</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l85"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:85</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Sets a hint.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">key</code>
-                        <span class="type">String</span>
-
-
-                    <div class="param-description">
-                        <p>The name of the hint.</p>
-
-                    </div>
-
-                </li>
-                <li class="param">
-                        <code class="param-name">value</code>
-                        <span class="type">Object</span>
-
-
-                    <div class="param-description">
-                        <p>Hint value</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_set_internet_connectivity" class="method item">
-    <h3 class="name"><code>set_internet_connectivity</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>The</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l145"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:145</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Set internet connectivity status.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">The</code>
-                        <span class="type">ConnectivityStatus</span>
-
-
-                    <div class="param-description">
-                        <p>internet connectivity status.</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-<div id="method_set_location" class="method item">
-    <h3 class="name"><code>set_location</code></h3>
-
-        <div class="args">
-            <span class="paren">(</span><ul class="args-list inline commas">
-                <li class="arg">
-                        <code>location</code>
-                </li>
-            </ul><span class="paren">)</span>
-        </div>
-
-
-
-
-
-
-
-
-    <div class="meta">
-                <p>
-                Defined in
-        <a href="../files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html#l36"><code>&#x2F;home&#x2F;alex&#x2F;dev&#x2F;work&#x2F;webapps&#x2F;branches&#x2F;scopes&#x2F;doc&#x2F;src&#x2F;bindings&#x2F;src&#x2F;search-metadata.js:36</code></a>
-        </p>
-
-
-
-    </div>
-
-    <div class="description">
-        <p>Set location.</p>
-
-    </div>
-
-        <div class="params">
-            <h4>Parameters:</h4>
-
-            <ul class="params-list">
-                <li class="param">
-                        <code class="param-name">location</code>
-                        <span class="type">Location</span>
-
-
-                    <div class="param-description">
-                        <p>data</p>
-
-                    </div>
-
-                </li>
-            </ul>
-        </div>
-
-
-
-</div>
-            </div>
-
-
-
-    </div>
-</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="../assets/vendor/prettify/prettify-min.js"></script>
-<script>prettyPrint();</script>
-<script src="../assets/js/yui-prettify.js"></script>
-<script src="../assets/../api.js"></script>
-<script src="../assets/js/api-filter.js"></script>
-<script src="../assets/js/api-list.js"></script>
-<script src="../assets/js/api-search.js"></script>
-<script src="../assets/js/apidocs.js"></script>
-</body>
-</html>

=== modified file 'doc/docbuild/classes/SearchQuery.html'
--- doc/docbuild/classes/SearchQuery.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/SearchQuery.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/classes/SearchReply.html'
--- doc/docbuild/classes/SearchReply.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/classes/SearchReply.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/data.json'
--- doc/docbuild/data.json	2015-10-20 20:44:15 +0000
+++ doc/docbuild/data.json	2015-10-26 22:14:51 +0000
@@ -61,6 +61,58 @@
             "fors": {},
             "namespaces": {}
         },
+        "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js": {
+            "name": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "modules": {},
+            "classes": {
+                "Department": 1
+            },
+            "fors": {},
+            "namespaces": {}
+        },
+        "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/filter-option.js": {
+            "name": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/filter-option.js",
+            "modules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        },
+        "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/filter-state.js": {
+            "name": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/filter-state.js",
+            "modules": {},
+            "classes": {
+                "FilterOption": 1
+            },
+            "fors": {},
+            "namespaces": {}
+        },
+        "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js": {
+            "name": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "modules": {},
+            "classes": {
+                "OnlineAccountClientServiceStatus": 1
+            },
+            "fors": {},
+            "namespaces": {}
+        },
+        "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client.js": {
+            "name": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client.js",
+            "modules": {},
+            "classes": {
+                "OnlineAccountClient": 1
+            },
+            "fors": {},
+            "namespaces": {}
+        },
+        "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js": {
+            "name": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "modules": {},
+            "classes": {
+                "OptionSelectorFilter": 1
+            },
+            "fors": {},
+            "namespaces": {}
+        },
         "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/preview-query.js": {
             "name": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/preview-query.js",
             "modules": {},
@@ -101,7 +153,7 @@
             "name": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/search-metadata.js",
             "modules": {},
             "classes": {
-                "SearchMetaData": 1
+                "SearchMetadata": 1
             },
             "fors": {},
             "namespaces": {}
@@ -145,11 +197,16 @@
                 "CategoryRenderer": 1,
                 "Category": 1,
                 "ColumnLayout": 1,
+                "Department": 1,
+                "FilterOption": 1,
+                "OnlineAccountClientServiceStatus": 1,
+                "OnlineAccountClient": 1,
+                "OptionSelectorFilter": 1,
                 "PreviewQuery": 1,
                 "PreviewReply": 1,
                 "PreviewWidget": 1,
                 "Result": 1,
-                "SearchMetaData": 1,
+                "SearchMetadata": 1,
                 "SearchQuery": 1,
                 "SearchReply": 1,
                 "Scope": 1
@@ -161,27 +218,15 @@
             "line": 25,
             "description": "Metadata passed to scopes for preview and activation",
             "is_constructor": 1,
+            "params": [
+                {
+                    "name": "query",
+                    "description": "query associated with the Department",
+                    "type": "CannedQuery"
+                }
+            ],
             "example": [
                 "\n\n     var scopes = require('unity-js-scopes')\n     function on_preview(result, action_metadata) {\n       return new scopes.lib.preview_query(\n         result,\n         action_metadata,\n         // run\n         function(preview_reply) {},\n         // cancelled\n         function() {});\n     }\n     scopes.self.initialize(\n      {}\n      ,\n      {\n        run: function() { },\n        start: function(scope_id) { },\n        preview: on_preview,\n      }\n    );"
-            ],
-            "params": [
-                {
-                    "name": "canned_query",
-                    "description": "CannedQuery"
-                },
-                {
-                    "name": "action_metadata",
-                    "description": "ActionMetadata"
-                },
-                {
-                    "name": "run",
-                    "description": "Function() Function callback that is to be called by the scope runtime to start the preview.\n              Your implementation of run() can use the provided PreviewReply object to\n              push results for the preview and call finished() on the reply object when\n              you are done with pushing results. You can push results from within run(),\n              in which case the preview implicitly completes when run() returns.\n              Alternatively, run() can store the reply object and return immediately.",
-                    "type": "PreviewReply"
-                },
-                {
-                    "name": "cancelled",
-                    "description": "Function() Called by the scopes runtime when the query originator cancels a query.\n              Your implementation of this method should ensure that the scope stops\n              processing the current query as soon as possible. Any calls to a `push()` method\n              once a query is cancelled are ignored, so continuing to push after cancellation"
-                }
             ]
         }
     },
@@ -270,6 +315,76 @@
             "line": 1,
             "description": "Describes a column layout for preview widgets."
         },
+        "Department": {
+            "name": "Department",
+            "shortname": "Department",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "ScopeJS",
+            "namespace": "",
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 1,
+            "description": "A department with optional sub-department"
+        },
+        "FilterOption": {
+            "name": "FilterOption",
+            "shortname": "FilterOption",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "ScopeJS",
+            "namespace": "",
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/filter-state.js",
+            "line": 1,
+            "description": "Captures state of multiple filters."
+        },
+        "OnlineAccountClientServiceStatus": {
+            "name": "OnlineAccountClientServiceStatus",
+            "shortname": "OnlineAccountClientServiceStatus",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "ScopeJS",
+            "namespace": "",
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "line": 1,
+            "description": "An object that contains the details about a service's status and authorization parameters"
+        },
+        "OnlineAccountClient": {
+            "name": "OnlineAccountClient",
+            "shortname": "OnlineAccountClient",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "ScopeJS",
+            "namespace": "",
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client.js",
+            "line": 1,
+            "description": "A simple interface for integrating online accounts access and monitoring into scopes."
+        },
+        "OptionSelectorFilter": {
+            "name": "OptionSelectorFilter",
+            "shortname": "OptionSelectorFilter",
+            "classitems": [],
+            "plugins": [],
+            "extensions": [],
+            "plugin_for": [],
+            "extension_for": [],
+            "module": "ScopeJS",
+            "namespace": "",
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 1,
+            "description": "A selection filter that displays a list of choices and allows one or more of them to be selected"
+        },
         "PreviewQuery": {
             "name": "PreviewQuery",
             "shortname": "PreviewQuery",
@@ -326,9 +441,9 @@
             "line": 1,
             "description": "The attributes of a result returned by a Scope\nThe Result API provides convenience methods for some typical attributes (title, art), but scopes are free to add and use any custom attributes with set/get methods. The only required attribute is 'uri' and it must not be empty before calling Reply.push()."
         },
-        "SearchMetaData": {
-            "name": "SearchMetaData",
-            "shortname": "SearchMetaData",
+        "SearchMetadata": {
+            "name": "SearchMetadata",
+            "shortname": "SearchMetadata",
             "classitems": [],
             "plugins": [],
             "extensions": [],
@@ -933,6 +1048,534 @@
             "module": "ScopeJS"
         },
         {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 14,
+            "description": "Add sub-department to this department",
+            "itemtype": "method",
+            "name": "add_subdepartment",
+            "params": [
+                {
+                    "name": "sub",
+                    "description": "department",
+                    "type": "Department"
+                }
+            ],
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 21,
+            "description": "Get the alternate label of this department\nReturn the alternate label of this department. The alternate label expresses the plural \"all\" form of the normal label. For example, if the normal label is \"Books\", then the alternate label is \"All Books\". Note that alternate label and can be empty - in that case the normal label should be displayed instead",
+            "itemtype": "method",
+            "name": "alternate_label",
+            "return": {
+                "description": "alternate label",
+                "type": "String"
+            },
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 29,
+            "description": "Set sub-departments of this department",
+            "params": [
+                {
+                    "name": "departments",
+                    "description": "",
+                    "type": "Array of Department"
+                }
+            ],
+            "itemtype": "method",
+            "name": "set_subdepartments",
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 36,
+            "description": "Sets has_subdepartments flag of this department",
+            "itemtype": "method",
+            "name": "set_has_subdepartments",
+            "params": [
+                {
+                    "name": "subdepartments",
+                    "description": "",
+                    "type": "Boolean"
+                }
+            ],
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 43,
+            "description": "Get the identifier of this department",
+            "itemtype": "method",
+            "name": "id",
+            "return": {
+                "description": "identifier of this department",
+                "type": "String"
+            },
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 50,
+            "description": "Get the label of this department",
+            "itemtype": "method",
+            "name": "label",
+            "return": {
+                "description": "label of this department",
+                "type": "String"
+            },
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 57,
+            "description": "Get the alternate label of this department",
+            "itemtype": "method",
+            "name": "alternate_label",
+            "return": {
+                "description": "alternate label of this department",
+                "type": "String"
+            },
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 64,
+            "description": "Get the canned query associated with this department",
+            "itemtype": "method",
+            "name": "query",
+            "return": {
+                "description": "canned query associated with this department",
+                "type": "CannedQuery"
+            },
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 71,
+            "description": "Get list of sub-departments of this department",
+            "itemtype": "method",
+            "name": "subdepartments",
+            "return": {
+                "description": "list of sub-departments of this department",
+                "type": "Array of Department"
+            },
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/department.js",
+            "line": 78,
+            "description": "Check if this department has subdepartments or has_subdepartments flag is set",
+            "itemtype": "method",
+            "name": "has_subdepartments",
+            "return": {
+                "description": "True if this department has subdepartments or has_subdepartments flag is set",
+                "type": "Boolean"
+            },
+            "class": "Department",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/filter-option.js",
+            "line": 11,
+            "description": "Get the identifier of this filter option",
+            "itemtype": "method",
+            "name": "id",
+            "return": {
+                "description": "String The option identifier"
+            },
+            "class": "FilterOption",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/filter-option.js",
+            "line": 18,
+            "description": "Get the label of this filter option",
+            "itemtype": "method",
+            "name": "label",
+            "return": {
+                "description": "String The option label"
+            },
+            "class": "FilterOption",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/filter-state.js",
+            "line": 12,
+            "description": "Check if state for the given filter has been stored",
+            "itemtype": "method",
+            "name": "has_filter",
+            "params": [
+                {
+                    "name": "id",
+                    "description": "String filter id"
+                }
+            ],
+            "return": {
+                "description": "True if state for the given filter has been stored"
+            },
+            "class": "FilterOption",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/filter-state.js",
+            "line": 20,
+            "description": "Removes the state for a specific filter",
+            "itemtype": "method",
+            "name": "remove",
+            "params": [
+                {
+                    "name": "id",
+                    "description": "String filter id"
+                }
+            ],
+            "class": "FilterOption",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "line": 11,
+            "description": "Check if state for the given filter has been stored",
+            "itemtype": "property",
+            "name": "account_id",
+            "type": "String",
+            "class": "OnlineAccountClientServiceStatus",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "line": 16,
+            "description": "True if this service is enabled",
+            "itemtype": "property",
+            "name": "service_enabled",
+            "type": "Boolean",
+            "class": "OnlineAccountClientServiceStatus",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "line": 21,
+            "description": "True if this service is authenticated",
+            "itemtype": "property",
+            "name": "service_authenticated",
+            "type": "Boolean",
+            "class": "OnlineAccountClientServiceStatus",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "line": 26,
+            "description": "\"ConsumerKey\" / \"ClientId\" OAuth (1 / 2) parameter.",
+            "itemtype": "property",
+            "name": "client_id",
+            "type": "String",
+            "class": "OnlineAccountClientServiceStatus",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "line": 31,
+            "description": "\"ClientSecret\" / \"ConsumerSecret\" OAuth (1 / 2) parameter.",
+            "itemtype": "property",
+            "name": "client_secret",
+            "type": "String",
+            "class": "OnlineAccountClientServiceStatus",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "line": 36,
+            "description": "\"AccessToken\" OAuth parameter.",
+            "itemtype": "property",
+            "name": "access_token",
+            "type": "String",
+            "class": "OnlineAccountClientServiceStatus",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "line": 41,
+            "description": "\"TokenSecret\" OAuth parameter.",
+            "itemtype": "property",
+            "name": "token_secret",
+            "type": "String",
+            "class": "OnlineAccountClientServiceStatus",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client-service-status.js",
+            "line": 46,
+            "description": "Error message (empty if no error occurred).",
+            "itemtype": "property",
+            "name": "error",
+            "type": "String",
+            "class": "OnlineAccountClientServiceStatus",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client.js",
+            "line": 15,
+            "description": "Get statuses for all services matching the name, type and provider specified on construction",
+            "itemtype": "method",
+            "name": "get_service_statuses",
+            "return": {
+                "description": "list of service statuses",
+                "type": "Array of OnlineAccountClientServiceStatus"
+            },
+            "class": "OnlineAccountClient",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client.js",
+            "line": 22,
+            "description": "Refresh all service statuses\nWARNING: If a service update callback is set, this method will invoke that callback for each service monitored. Therefore, DO NOT call this method from within your callback function!",
+            "itemtype": "method",
+            "name": "refresh_service_statuses",
+            "class": "OnlineAccountClient",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client.js",
+            "line": 29,
+            "description": "Register a result item that requires the user to be logged in.",
+            "params": [
+                {
+                    "name": "result",
+                    "description": "The result item that needs account access",
+                    "type": "Result"
+                },
+                {
+                    "name": "query",
+                    "description": "The scope's current query",
+                    "type": "CannedQuery"
+                },
+                {
+                    "name": "login_passed_action",
+                    "description": "The action to take upon successful login",
+                    "type": "PostLoginAction"
+                },
+                {
+                    "name": "login_failed_action",
+                    "description": "The action to take upon unsuccessful login",
+                    "type": "PostLoginAction"
+                }
+            ],
+            "itemtype": "method",
+            "name": "register_account_login_item",
+            "class": "OnlineAccountClient",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client.js",
+            "line": 39,
+            "description": "Refresh all service statuses",
+            "itemtype": "method",
+            "name": "register_account_login_item",
+            "params": [
+                {
+                    "name": "widget",
+                    "description": "The widget item that needs account access",
+                    "type": "PreviewWidget"
+                },
+                {
+                    "name": "login_passed_action",
+                    "description": "The action to take upon successful login",
+                    "type": "PostLoginAction"
+                },
+                {
+                    "name": "login_failed_action",
+                    "description": "The action to take upon unsuccessful login",
+                    "type": "PostLoginAction"
+                }
+            ],
+            "class": "OnlineAccountClient",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/online-account-client.js",
+            "line": 48,
+            "description": "Set the callback function to be invoked when a service status changes",
+            "itemtype": "method",
+            "name": "set_service_update_callback",
+            "params": [
+                {
+                    "name": "callback",
+                    "description": "",
+                    "type": "Function(OnlineAccountServiceStatus)"
+                }
+            ],
+            "class": "OnlineAccountClient",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 15,
+            "description": "Get the label of this filter",
+            "itemtype": "method",
+            "name": "label",
+            "return": {
+                "description": "label of this filter",
+                "type": "String"
+            },
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 22,
+            "description": "Check if this filter supports multiple options to be selected",
+            "itemtype": "method",
+            "name": "multi_select",
+            "return": {
+                "description": "True if this filter multiple options to be selected",
+                "type": "Boolean"
+            },
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 29,
+            "description": "Add a new option to this filter",
+            "itemtype": "method",
+            "name": "add_option",
+            "return": {
+                "description": "FilterOption The added filter option"
+            },
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 36,
+            "description": "Get all options of this filter, in the order they were added",
+            "itemtype": "method",
+            "name": "options",
+            "return": {
+                "description": "",
+                "type": "Array of FilterOption"
+            },
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 43,
+            "description": "Check if an option is active for this filter",
+            "itemtype": "method",
+            "name": "has_active_option",
+            "params": [
+                {
+                    "name": "filter_state",
+                    "description": "FilterState"
+                }
+            ],
+            "return": {
+                "description": "True if an option is active for this filter",
+                "type": "Boolean"
+            },
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 51,
+            "description": "Get active options from an instance of FilterState for this filter",
+            "itemtype": "method",
+            "name": "active_options",
+            "params": [
+                {
+                    "name": "filter_state",
+                    "description": "FilterState"
+                }
+            ],
+            "return": {
+                "description": "LIst of active FilterOption",
+                "type": "Array of FilterOption"
+            },
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 59,
+            "description": "Marks given FilterOption of this filter instance as active (or not active) in a FilterState object.\nRecords the given FilterOption as \"selected\" in the FilterState. This is meant to be used to modify a FilterState received with a search request before sending it back to the client (UI shell).",
+            "itemtype": "method",
+            "name": "update_state",
+            "params": [
+                {
+                    "name": "filter_state",
+                    "description": "",
+                    "type": "FilterState"
+                },
+                {
+                    "name": "option",
+                    "description": "",
+                    "type": "FilterOption"
+                },
+                {
+                    "name": "active",
+                    "description": "",
+                    "type": "Boolean"
+                }
+            ],
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 69,
+            "description": "Sets display hints for the Shell UI",
+            "itemtype": "method",
+            "name": "set_display_hints",
+            "params": [
+                {
+                    "name": "hints",
+                    "description": "0 is Default filter hint, 1 is Primary filter hint",
+                    "type": "Int"
+                }
+            ],
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 76,
+            "description": "Get the identifier of this filter",
+            "itemtype": "method",
+            "name": "id",
+            "return": {
+                "description": "identifier of this filter",
+                "type": "String"
+            },
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
+            "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/option-selector-filter.js",
+            "line": 83,
+            "description": "Get the type name of this filter",
+            "itemtype": "method",
+            "name": "filter_type",
+            "return": {
+                "description": "type name of this filter",
+                "type": "String"
+            },
+            "class": "OptionSelectorFilter",
+            "module": "ScopeJS"
+        },
+        {
             "file": "/home/alex/dev/work/webapps/branches/scopes/doc/src/bindings/src/preview-query.js",
             "line": 47,
             "description": "Get result for this preview request",
@@ -1419,7 +2062,7 @@
                     "type": "Int"
                 }
             ],
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1432,7 +2075,7 @@
                 "description": "",
                 "type": "Int"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1448,7 +2091,7 @@
                     "type": "Location"
                 }
             ],
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1461,7 +2104,7 @@
                 "description": "data representing the current location, including attributes such as city and country.",
                 "type": "Location"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1474,7 +2117,7 @@
                 "description": "True if there is a location property.",
                 "type": "Boolean"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1483,7 +2126,7 @@
             "description": "Remove location data entirely.\nThis method does nothing if no location data is present.",
             "itemtype": "method",
             "name": "remove_location",
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1499,7 +2142,7 @@
                     "type": "Array of String"
                 }
             ],
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1512,7 +2155,7 @@
                 "description": "The list of scope keywords used to initiate this search request.",
                 "type": "Array of String"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1525,7 +2168,7 @@
                 "description": "True if this search request originated from an aggregator scope.",
                 "type": "Boolean"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1545,7 +2188,7 @@
                     "description": "Hint value"
                 }
             ],
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1558,7 +2201,7 @@
                 "description": "",
                 "type": "Dictionary"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1578,7 +2221,7 @@
                 "description": "True if the hint is set.",
                 "type": "Boolean"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1599,7 +2242,7 @@
                     "type": "String"
                 }
             ],
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1619,7 +2262,7 @@
                 "description": ", {Number} or {Object}",
                 "type": "String"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1631,7 +2274,7 @@
             "return": {
                 "description": "The form factor string"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1643,7 +2286,7 @@
             "return": {
                 "description": "The locale string"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1656,7 +2299,7 @@
                 "description": "The internet connectivity status.",
                 "type": "ConnectivityStatus"
             },
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {
@@ -1672,7 +2315,7 @@
                     "type": "ConnectivityStatus"
                 }
             ],
-            "class": "SearchMetaData",
+            "class": "SearchMetadata",
             "module": "ScopeJS"
         },
         {

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_index.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_index.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_index.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_action-metadata.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_action-metadata.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_action-metadata.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_activation-query.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_activation-query.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_activation-query.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_categorised-result.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_categorised-result.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_categorised-result.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_category-renderer.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_category-renderer.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_category-renderer.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_category.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_category.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_category.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_column-layout.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_column-layout.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_column-layout.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_preview-query.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_preview-query.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_preview-query.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_preview-reply.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_preview-reply.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_preview-reply.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_preview-widget.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_preview-widget.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_preview-widget.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_result.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_result.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_result.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-metadata.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>
@@ -104,16 +109,16 @@
  *  - with cardinality, locale, and form factor.
  *
  * @module ScopeJS
- * @class SearchMetaData
+ * @class SearchMetadata
  * 
  * @constructor
  * @param cardinality maximum number of search results
  * @param locale locale string, eg. en_EN
  * @param form_factor form factor name, e.g. phone, desktop, phone-version etc.
  * @param category The category for the result.*/
-function SearchMetaData(){}
+function SearchMetadata(){}
 
-SearchMetaData.prototype = {
+SearchMetadata.prototype = {
 /**
 * Set cardinality.
  * @method set_cardinality

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-query.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-query.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-query.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-reply.js.html'
--- doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-reply.js.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/files/_home_alex_dev_work_webapps_branches_scopes_doc_src_bindings_src_search-reply.js.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/index.html'
--- doc/docbuild/index.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/index.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="./classes/Category.html">Category</a></li>
                                 <li><a href="./classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="./classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="./classes/Department.html">Department</a></li>
+                                <li><a href="./classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="./classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="./classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="./classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="./classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="./classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="./classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="./classes/Result.html">Result</a></li>
                                 <li><a href="./classes/Scope.html">Scope</a></li>
-                                <li><a href="./classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="./classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="./classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="./classes/SearchReply.html">SearchReply</a></li>
                             </ul>

=== modified file 'doc/docbuild/modules/ScopeJS.html'
--- doc/docbuild/modules/ScopeJS.html	2015-10-20 20:44:15 +0000
+++ doc/docbuild/modules/ScopeJS.html	2015-10-26 22:14:51 +0000
@@ -44,12 +44,17 @@
                                 <li><a href="../classes/Category.html">Category</a></li>
                                 <li><a href="../classes/CategoryRenderer.html">CategoryRenderer</a></li>
                                 <li><a href="../classes/ColumnLayout.html">ColumnLayout</a></li>
+                                <li><a href="../classes/Department.html">Department</a></li>
+                                <li><a href="../classes/FilterOption.html">FilterOption</a></li>
+                                <li><a href="../classes/OnlineAccountClient.html">OnlineAccountClient</a></li>
+                                <li><a href="../classes/OnlineAccountClientServiceStatus.html">OnlineAccountClientServiceStatus</a></li>
+                                <li><a href="../classes/OptionSelectorFilter.html">OptionSelectorFilter</a></li>
                                 <li><a href="../classes/PreviewQuery.html">PreviewQuery</a></li>
                                 <li><a href="../classes/PreviewReply.html">PreviewReply</a></li>
                                 <li><a href="../classes/PreviewWidget.html">PreviewWidget</a></li>
                                 <li><a href="../classes/Result.html">Result</a></li>
                                 <li><a href="../classes/Scope.html">Scope</a></li>
-                                <li><a href="../classes/SearchMetaData.html">SearchMetaData</a></li>
+                                <li><a href="../classes/SearchMetadata.html">SearchMetadata</a></li>
                                 <li><a href="../classes/SearchQuery.html">SearchQuery</a></li>
                                 <li><a href="../classes/SearchReply.html">SearchReply</a></li>
                             </ul>
@@ -167,6 +172,31 @@
                     </a>
                 </li>
                 <li class="module-class">
+                    <a href="../classes/Department.html">
+                        Department
+                    </a>
+                </li>
+                <li class="module-class">
+                    <a href="../classes/FilterOption.html">
+                        FilterOption
+                    </a>
+                </li>
+                <li class="module-class">
+                    <a href="../classes/OnlineAccountClient.html">
+                        OnlineAccountClient
+                    </a>
+                </li>
+                <li class="module-class">
+                    <a href="../classes/OnlineAccountClientServiceStatus.html">
+                        OnlineAccountClientServiceStatus
+                    </a>
+                </li>
+                <li class="module-class">
+                    <a href="../classes/OptionSelectorFilter.html">
+                        OptionSelectorFilter
+                    </a>
+                </li>
+                <li class="module-class">
                     <a href="../classes/PreviewQuery.html">
                         PreviewQuery
                     </a>
@@ -192,8 +222,8 @@
                     </a>
                 </li>
                 <li class="module-class">
-                    <a href="../classes/SearchMetaData.html">
-                        SearchMetaData
+                    <a href="../classes/SearchMetadata.html">
+                        SearchMetadata
                     </a>
                 </li>
                 <li class="module-class">

=== modified file 'examples/simple-click/src/js-scope.webapps_js-scope.js'
--- examples/simple-click/src/js-scope.webapps_js-scope.js	2015-10-13 17:53:25 +0000
+++ examples/simple-click/src/js-scope.webapps_js-scope.js	2015-10-26 22:14:51 +0000
@@ -36,7 +36,7 @@
                         + scopes.self.scope_config)
         },
         search: function(canned_query, metadata) {
-            return new scopes.lib.search_query(
+            return new scopes.lib.SearchQuery(
                 canned_query,
                 metadata,
                 // run
@@ -65,7 +65,7 @@
                         response.on('end', function() {
                             r = JSON.parse(res);
                             for (i = 0; i < r.length; i++) {
-                                var categorised_result = new scopes.lib.categorised_result(category);
+                                var categorised_result = new scopes.lib.CategorisedResult(category);
                                 categorised_result.set_uri(r[i].url);
                                 categorised_result.set_title(r[i].title);
                                 categorised_result.set_art(r[i].imageUrl);
@@ -87,14 +87,14 @@
                 });
         },
         preview: function(result, action_metadata) {
-            return new scopes.lib.preview_query(
+            return new scopes.lib.PreviewQuery(
                 result,
                 action_metadata,
                 // run
                 function(preview_reply) {
-                    var layout1col = new scopes.lib.column_layout(1);
-                    var layout2col = new scopes.lib.column_layout(2);
-                    var layout3col = new scopes.lib.column_layout(3);
+                    var layout1col = new scopes.lib.ColumnLayout(1);
+                    var layout2col = new scopes.lib.ColumnLayout(2);
+                    var layout3col = new scopes.lib.ColumnLayout(3);
                     layout1col.add_column(["image", "header", "summary"]);
 
                     layout2col.add_column(["image"]);
@@ -106,14 +106,14 @@
 
                     preview_reply.register_layout([layout1col, layout2col, layout3col]);
 
-                    var header = new scopes.lib.preview_widget("header", "header");
+                    var header = new scopes.lib.PreviewWidget("header", "header");
                     header.add_attribute_mapping("title", "title");
                     header.add_attribute_mapping("subtitle", "subtitle");
 
-                    var image = new scopes.lib.preview_widget("image", "image");
+                    var image = new scopes.lib.PreviewWidget("image", "image");
                     image.add_attribute_mapping("source", "art");
 
-                    var description = new scopes.lib.preview_widget("summary", "text");
+                    var description = new scopes.lib.PreviewWidget("summary", "text");
                     description.add_attribute_mapping("text", "description");
 
                     preview_reply.push([image, header, description ]);

=== modified file 'examples/simple/simple.js'
--- examples/simple/simple.js	2015-10-21 19:44:36 +0000
+++ examples/simple/simple.js	2015-10-26 22:14:51 +0000
@@ -32,7 +32,7 @@
                         + scopes.self.scope_config)
         },
         search: function(canned_query, metadata) {
-            return new scopes.lib.search_query(
+            return new scopes.lib.SearchQuery(
                 canned_query,
                 metadata,
                 // run
@@ -47,14 +47,14 @@
                             null);
 
                     var categorised_result =
-                        new scopes.lib.categorised_result(category);
+                        new scopes.lib.CategorisedResult(category);
                     categorised_result.set_uri("http://www.ubuntu.com");
                     categorised_result.set_title("'" + qs + "'");
 
                     var filter_state =
-                        new scopes.lib.filter_state();
+                        new scopes.lib.FilterState();
                     var option_filter =
-                        new scopes.lib.option_selector_filter('me', 'push', false);
+                        new scopes.lib.OptionSelectorFilter('me', 'push', false);
                     var option = option_filter.add_option("id", "yes");
 
                     var p = search_reply.push([option_filter], filter_state);

=== modified file 'examples/soundcloud/soundcloud.js'
--- examples/soundcloud/soundcloud.js	2015-10-13 17:53:25 +0000
+++ examples/soundcloud/soundcloud.js	2015-10-26 22:14:51 +0000
@@ -86,7 +86,7 @@
     result) {
 
     var categorised_result =
-        new scopes.lib.categorised_result(category);
+        new scopes.lib.CategorisedResult(category);
 
     categorised_result.set_uri(result.uri)
     categorised_result.set_title(result.description);
@@ -115,13 +115,13 @@
       } \
     }";
 
-    return new scopes.lib.search_query(
+    return new scopes.lib.SearchQuery(
         canned_query,
         metadata,
         // Query.run
         function(search_reply) {
             var category_renderer =
-                new scopes.lib.category_renderer(category_description);
+                new scopes.lib.CategoryRenderer(category_description);
             var category =
                 search_reply.register_category(
                     "tracks",
@@ -166,30 +166,30 @@
 };
 
 function on_preview(result, action_metadata) {
-    return new scopes.lib.preview_query(
+    return new scopes.lib.PreviewQuery(
         result,
         action_metadata,
         // run
         function(preview_reply) {
             var r = this.result();
 
-            var layout1col = new scopes.lib.column_layout(1)
+            var layout1col = new scopes.lib.ColumnLayout(1)
             layout1col.add_column(["imageId", "headerId", "actionsId"])
 
-            var layout2col = new scopes.lib.column_layout(2)
+            var layout2col = new scopes.lib.ColumnLayout(2)
             layout2col.add_column(["imageId"])
             layout2col.add_column(["headerId", "actionsId"])
 
             preview_reply.register_layout([layout1col, layout2col]);
 
-            var header_widget = new scopes.lib.preview_widget("headerId", "header");
+            var header_widget = new scopes.lib.PreviewWidget("headerId", "header");
             header_widget.add_attribute_mapping("title", "title");
             header_widget.add_attribute_mapping("subtitle", "subtitle");
 
-            var art_widget = new scopes.lib.preview_widget("imageId", "image");
+            var art_widget = new scopes.lib.PreviewWidget("imageId", "image");
             art_widget.add_attribute_mapping("source", "art");
 
-            var actions_widget = new scopes.lib.preview_widget("actionsId", "actions");
+            var actions_widget = new scopes.lib.PreviewWidget("actionsId", "actions");
             actions_widget.add_attribute_value(
                 "actions",
                 {

=== modified file 'src/bindings/src/addon.cc'
--- src/bindings/src/addon.cc	2015-10-22 19:50:35 +0000
+++ src/bindings/src/addon.cc	2015-10-26 22:14:51 +0000
@@ -392,39 +392,38 @@
     v8cpp::Module module(isolate);
     module.add_class("js_scope", js_scope);
     module.add_class("scope_base", scope_base);
-    module.add_class("action_metadata", action_metadata);
-    module.add_class("activation_query", activation_query);
-    module.add_class("category", category);
-    module.add_class("categorised_result", categorised_result);
-    module.add_class("canned_query", canned_query);
-    module.add_class("categorised_result", categorised_result);
-    module.add_class("category_renderer", category_renderer);
-    module.add_class("column_layout", column_layout);
-    module.add_class("department", department);
-    module.add_class("filter_option", filter_option);
-    module.add_class("filter_state", filter_state);
-    module.add_class("location", location);
-    module.add_class("online_account_client", online_account_client);
-    module.add_class("option_selector_filter", option_selector_filter);
-    module.add_class("preview_widget", preview_widget);
-    module.add_class("preview_query", preview_query);
-    module.add_class("preview_reply", preview_reply);
-    module.add_class("result", result);
-    module.add_class("search_reply", search_reply);
-    module.add_class("search_query", search_query);
-    module.add_class("search_metadata", search_metadata);
-    module.add_class("variant", variant);
-    module.add_class("variant_map", variant_map);
-    module.add_class("variant_array", variant_array);
+
+    module.add_class("ActionMetadata", action_metadata);
+    module.add_class("ActivationQuery", activation_query);
+    module.add_class("Category", category);
+    module.add_class("CategorisedResult", categorised_result);
+    module.add_class("CannedQuery", canned_query);
+    module.add_class("CategorisedResult", categorised_result);
+    module.add_class("CategoryRenderer", category_renderer);
+    module.add_class("ColumnLayout", column_layout);
+    module.add_class("Department", department);
+    module.add_class("FilterOption", filter_option);
+    module.add_class("FilterState", filter_state);
+    module.add_class("Location", location);
+    module.add_class("OnlineAccountClient", online_account_client);
+    module.add_class("OnlineAccountClientServiceStatus", online_account_service_status);
+    module.add_class("OptionSelectorFilter", option_selector_filter);
+    module.add_class("PreviewWidget", preview_widget);
+    module.add_class("PreviewQuery", preview_query);
+    module.add_class("PreviewReply", preview_reply);
+    module.add_class("Result", result);
+    module.add_class("SearchReply", search_reply);
+    module.add_class("SearchQuery", search_query);
+    module.add_class("SearchMetadata", search_metadata);
+    module.add_class("Variant", variant);
+    module.add_class("Variant_map", variant_map);
+    module.add_class("Variant_array", variant_array);
 
     // Factory functions
     module.add_function("new_scope", &new_scope);
 
     // Standalone functions
     module.add_function("new_category_renderer_from_file", &new_category_renderer_from_file);
-
-    module.add_function("create_option_selector_filter", &unity::scopes::OptionSelectorFilter::create);
-    
     module.add_function("runtime_version", &get_scopes_runtime_version);
 
     exports->SetPrototype(module.create_prototype());

=== modified file 'src/bindings/src/category-renderer.h'
--- src/bindings/src/category-renderer.h	2015-10-20 20:44:02 +0000
+++ src/bindings/src/category-renderer.h	2015-10-26 22:14:51 +0000
@@ -1,4 +1,4 @@
-de/*
+/*
  * Copyright 2015 Canonical Ltd.
  *
  * This file is part of unity-js-scopes.

=== modified file 'src/bindings/src/department.h'
--- src/bindings/src/department.h	2015-10-20 14:40:02 +0000
+++ src/bindings/src/department.h	2015-10-26 22:14:51 +0000
@@ -24,6 +24,120 @@
 
 #include <v8-cpp.h>
 
+/**
+
+--doc:class Department
+ * 
+ * A department with optional sub-department
+ * 
+ * @module ScopeJS
+ * @class Department
+--/doc:class
+
+--doc:constructor
+ * 
+ * @constructor
+ * @param query {CannedQuery} query associated with the Department
+ * @param label {String} name of the Department
+--/doc:constructor
+
+--doc:prototype OnlineAccountClient
+
+--doc:member
+ * Add sub-department to this department
+ * @method add_subdepartment
+ * @param {Department} sub department
+--doc:/member
+add_subdepartment: function(department) {
+}
+--/doc:member
+
+--doc:member
+ * Get the alternate label of this department
+ * Return the alternate label of this department. The alternate label expresses the plural "all" form of the normal label. For example, if the normal label is "Books", then the alternate label is "All Books". Note that alternate label and can be empty - in that case the normal label should be displayed instead
+ * @method alternate_label
+ * @return {String} alternate label
+--doc:/member
+alternate_label: function() {
+}
+--/doc:member
+
+--doc:member
+ * Set sub-departments of this department
+ * @param departments {Array of Department}
+ * @method set_subdepartments
+--doc:/member
+set_subdepartments: function(departments) {
+}
+--/doc:member
+
+--doc:member
+ * Sets has_subdepartments flag of this department
+ * @method set_has_subdepartments
+ * @param subdepartments {Boolean}
+--doc:/member
+set_has_subdepartments: function(subdepartments) {
+}
+--/doc:member
+
+--doc:member
+ * Get the identifier of this department
+ * @method id
+ * @return {String} identifier of this department
+--doc:/member
+id: function() {
+}
+--/doc:member
+
+--doc:member
+ * Get the label of this department
+ * @method label
+ * @return {String} label of this department
+--doc:/member
+label: function() {
+}
+--/doc:member
+
+--doc:member
+ * Get the alternate label of this department
+ * @method alternate_label
+ * @return {String} alternate label of this department
+--doc:/member
+alternate_label: function() {
+}
+--/doc:member
+
+--doc:member
+ * Get the canned query associated with this department
+ * @method query
+ * @return {CannedQuery} canned query associated with this department
+--doc:/member
+query: function() {
+}
+--/doc:member
+
+--doc:member
+ * Get list of sub-departments of this department
+ * @method subdepartments
+ * @return {Array of Department} list of sub-departments of this department
+--doc:/member
+subdepartments: function() {
+}
+--/doc:member
+
+--doc:member
+ * Check if this department has subdepartments or has_subdepartments flag is set
+ * @method has_subdepartments
+ * @return {Boolean} True if this department has subdepartments or has_subdepartments flag is set
+--doc:/member
+has_subdepartments: function() {
+}
+--/doc:member
+
+--/doc:prototype
+
+ */
+
 class Department
 {
  public:

=== added file 'src/bindings/src/filter-option.h'
--- src/bindings/src/filter-option.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/filter-option.h	2015-10-26 22:14:51 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * unity-js-scopes is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+
+--doc:class FilterOption
+ * 
+ * Holds definition of filter option for OptionSelectorFilter
+ * 
+ * @module ScopeJS
+ * @class FilterOption
+--/doc:class
+
+--doc:prototype CategoryRenderer
+
+--doc:member
+ * Get the identifier of this filter option
+ * @method id
+ * @return String The option identifier
+--doc:/member
+id: function() {
+}
+--/doc:member
+
+--doc:member
+ * Get the label of this filter option
+ * @method label
+ * @return String The option label
+--doc:/member
+label: function() {
+}
+--/doc:member
+
+--/doc:prototype
+
+ */
+

=== added file 'src/bindings/src/filter-state.h'
--- src/bindings/src/filter-state.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/filter-state.h	2015-10-26 22:14:51 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * unity-js-scopes is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+
+--doc:class FilterOption
+ * 
+ * Captures state of multiple filters.
+ * 
+ * @module ScopeJS
+ * @class FilterOption
+--/doc:class
+
+--doc:constructor
+ * 
+ * @constructor
+--/doc:constructor
+
+--doc:prototype FilterState
+
+--doc:member
+ * Check if state for the given filter has been stored
+ * @method has_filter
+ * @param id String filter id
+ * @return True if state for the given filter has been stored
+--doc:/member
+has_filter: function(id) {
+}
+--/doc:member
+
+--doc:member
+ * Removes the state for a specific filter
+ * @method remove
+ * @param id String filter id
+--doc:/member
+remove: function(id) {
+}
+--/doc:member
+
+--/doc:prototype
+
+ */
+

=== added file 'src/bindings/src/online-account-client-service-status.h'
--- src/bindings/src/online-account-client-service-status.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/online-account-client-service-status.h	2015-10-26 22:14:51 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * unity-js-scopes is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+/**
+
+--doc:class OnlineAccountClientServiceStatus
+ * 
+ * An object that contains the details about a service's status and authorization parameters
+ * 
+ * @module ScopeJS
+ * @class OnlineAccountClientServiceStatus
+--/doc:class
+
+--doc:prototype OnlineAccountClientServiceStatus
+
+--doc:member
+ * Check if state for the given filter has been stored
+ * @property account_id {String}
+--doc:/member
+--/doc:member
+
+--doc:member
+ * True if this service is enabled
+ * @property service_enabled {Boolean}
+--doc:/member
+--/doc:member
+
+--doc:member
+ * True if this service is authenticated
+ * @property service_authenticated {Boolean}
+--doc:/member
+--/doc:member
+
+--doc:member
+ * "ConsumerKey" / "ClientId" OAuth (1 / 2) parameter.
+ * @property client_id {String}
+--doc:/member
+--/doc:member
+
+--doc:member
+ * "ClientSecret" / "ConsumerSecret" OAuth (1 / 2) parameter.
+ * @property client_secret {String}
+--doc:/member
+--/doc:member
+
+--doc:member
+ * "AccessToken" OAuth parameter.
+ * @property access_token {String}
+--doc:/member
+--/doc:member
+
+--doc:member
+ * "TokenSecret" OAuth parameter.
+ * @property token_secret {String}
+--doc:/member
+--/doc:member
+
+--doc:member
+ * Error message (empty if no error occurred).
+ * @property error {String}
+--doc:/member
+--/doc:member
+
+--/doc:prototype
+
+ */

=== modified file 'src/bindings/src/online-account-client.h'
--- src/bindings/src/online-account-client.h	2015-10-16 13:39:16 +0000
+++ src/bindings/src/online-account-client.h	2015-10-26 22:14:51 +0000
@@ -28,6 +28,80 @@
 
 #include <v8-cpp.h>
 
+/**
+
+--doc:class OnlineAccountClient
+ * 
+ * A simple interface for integrating online accounts access and monitoring into scopes.
+ * 
+ * @module ScopeJS
+ * @class OnlineAccountClient
+--/doc:class
+
+--doc:constructor
+ * 
+ * @constructor
+ * @param service_name {String} The name of the service (E.g. "com.ubuntu.scopes.youtube_youtube")
+ * @param service_type {String} The type of service (E.g. "sharing")
+ * @param provider_name {String} The name of the service provider (E.g. "google")
+--/doc:constructor
+
+--doc:prototype OnlineAccountClient
+
+--doc:member
+ * Get statuses for all services matching the name, type and provider specified on construction
+ * @method get_service_statuses
+ * @return {Array of OnlineAccountClientServiceStatus} list of service statuses
+--doc:/member
+get_service_statuses: function() {
+}
+--/doc:member
+
+--doc:member
+ * Refresh all service statuses
+ * WARNING: If a service update callback is set, this method will invoke that callback for each service monitored. Therefore, DO NOT call this method from within your callback function!
+ * @method refresh_service_statuses
+--doc:/member
+refresh_service_statuses: function() {
+}
+--/doc:member
+
+--doc:member
+ * Register a result item that requires the user to be logged in.
+ * @param result {Result} The result item that needs account access
+ * @param query {CannedQuery} The scope's current query
+ * @param login_passed_action {PostLoginAction} The action to take upon successful login
+ * @param login_failed_action {PostLoginAction} The action to take upon unsuccessful login
+ * @method register_account_login_item
+--doc:/member
+refresh_account_login_item: function(result, query, login_passed_action, login_failed_action) {
+}
+--/doc:member
+
+--doc:member
+ * Refresh all service statuses
+ * @method register_account_login_item
+ * @param widget {PreviewWidget} The widget item that needs account access
+ * @param login_passed_action {PostLoginAction} The action to take upon successful login
+ * @param login_failed_action {PostLoginAction} The action to take upon unsuccessful login
+--doc:/member
+register_account_login_item: function(widget, login_passed_action, login_failed_action) {
+}
+--/doc:member
+
+--doc:member
+ * Set the callback function to be invoked when a service status changes
+ * @method set_service_update_callback
+ * @param {Function(OnlineAccountServiceStatus)} callback
+--doc:/member
+set_service_update_callback: function(callback) {
+}
+--/doc:member
+
+--/doc:prototype
+
+ */
+
 class OnlineAccountClient : public std::enable_shared_from_this<OnlineAccountClient>
 {
  public:

=== modified file 'src/bindings/src/option-selector-filter.h'
--- src/bindings/src/option-selector-filter.h	2015-10-21 19:44:36 +0000
+++ src/bindings/src/option-selector-filter.h	2015-10-26 22:14:51 +0000
@@ -24,6 +24,126 @@
 #include <v8-cpp.h>
 
 
+/**
+
+--doc:class OptionSelectorFilter
+ * 
+ * A selection filter that displays a list of choices and allows one or more of them to be selected
+ * 
+ * @module ScopeJS
+ * @class OptionSelectorFilter
+--/doc:class
+
+--doc:constructor
+ * 
+ * @constructor
+ * @param id {String} A unique identifier for the filter that can be used to identify it later among several filters
+ * @param label {String} A display label for the filter
+ * @param multi_select {Boolean} If true, the filter permits more than option to be selected; otherwise, only a single option can be selected
+--/doc:constructor
+
+--doc:prototype OptionSelectorFilter
+
+--doc:member
+ * Get the label of this filter
+ * @method label
+ * @return {String} label of this filter
+--doc:/member
+label: function() {
+}
+--/doc:member
+
+--doc:member
+ * Check if this filter supports multiple options to be selected
+ * @method multi_select
+ * @return {Boolean} True if this filter multiple options to be selected
+--doc:/member
+multi_select: function() {
+}
+--/doc:member
+
+--doc:member
+ * Add a new option to this filter
+ * @method add_option
+ * @return FilterOption The added filter option
+--doc:/member
+add_option: function() {
+}
+--/doc:member
+
+--doc:member
+ * Get all options of this filter, in the order they were added
+ * @method options
+ * @return {Array of FilterOption}
+--doc:/member
+options: function() {
+}
+--/doc:member
+
+--doc:member
+ * Check if an option is active for this filter
+ * @method has_active_option
+ * @param filter_state FilterState
+ * @return {Boolean} True if an option is active for this filter
+--doc:/member
+has_active_option: function(filter_state) {
+}
+--/doc:member
+
+--doc:member
+ * Get active options from an instance of FilterState for this filter
+ * @method active_options
+ * @param filter_state FilterState
+ * @return {Array of FilterOption} LIst of active FilterOption
+--doc:/member
+active_options: function() {
+}
+--/doc:member
+
+--doc:member
+ * Marks given FilterOption of this filter instance as active (or not active) in a FilterState object.
+ * Records the given FilterOption as "selected" in the FilterState. This is meant to be used to modify a FilterState received with a search request before sending it back to the client (UI shell).
+ * @method update_state
+ * @param filter_state {FilterState}
+ * @param option {FilterOption}
+ * @param active {Boolean}
+--doc:/member
+update_state: function(filter_state, option, active) {
+}
+--/doc:member
+
+--doc:member
+ * Sets display hints for the Shell UI
+ * @method set_display_hints
+ * @param hints {int} 0 is Default filter hint, 1 is Primary filter hint
+--doc:/member
+set_display_hints: function(hints) {
+}
+--/doc:member
+
+--doc:member
+ * Get the identifier of this filter
+ * @method id
+ * @return {String} identifier of this filter
+--doc:/member
+id: function() {
+}
+--/doc:member
+
+--doc:member
+ * Get the type name of this filter
+ * @method filter_type
+ * @return {String} type name of this filter
+--doc:/member
+filter_type: function() {
+}
+--/doc:member
+
+--/doc:prototype
+
+ */
+
+
 class OptionSelectorFilter
 {
  public: