diff --git a/dist/js/widgets/widget-scroller.min.js b/dist/js/widgets/widget-scroller.min.js
index 66a87c67..72f5b196 100644
--- a/dist/js/widgets/widget-scroller.min.js
+++ b/dist/js/widgets/widget-scroller.min.js
@@ -1,2 +1,2 @@
 /*! Widget: scroller - updated 5/17/2015 (v2.22.0) */
-!function(a,b){"use strict";var c=a.tablesorter,d=c.css;a.extend(c.css,{scrollerWrap:"tablesorter-scroller",scrollerHeader:"tablesorter-scroller-header",scrollerTable:"tablesorter-scroller-table",scrollerFooter:"tablesorter-scroller-footer",scrollerFixed:"tablesorter-scroller-fixed",scrollerFixedPanel:"tablesorter-scroller-fixed-panel",scrollerHasFix:"tablesorter-scroller-has-fixed-columns",scrollerHideColumn:"tablesorter-scroller-hidden-column",scrollerHideElement:"tablesorter-scroller-hidden",scrollerSpacerRow:"tablesorter-scroller-spacer",scrollerBarSpacer:"tablesorter-scroller-bar-spacer",scrollerAddedHeight:"tablesorter-scroller-added-height",scrollerHack:"tablesorter-scroller-scrollbar-hack",scrollerRtl:"ts-scroller-rtl"}),c.addWidget({id:"scroller",priority:60,options:{scroller_height:300,scroller_jumpToHeader:!0,scroller_upAfterSort:!0,scroller_fixedColumns:0,scroller_rowHighlight:"hover",scroller_addFixedOverlay:!1,scroller_barWidth:null},format:function(a,b,d){b.isScrolling||c.scroller.setup(b,d)},remove:function(a,b,d){c.scroller.remove(b,d)}}),c.window_resize=function(){c.timer_resize&&clearTimeout(c.timer_resize),c.timer_resize=setTimeout(function(){a(b).trigger("resizeEnd")},250)},a(function(){var b="<style>."+d.scrollerWrap+" { position: relative; overflow: hidden; }."+d.scrollerWrap+" * { box-sizing: border-box; }."+d.scrollerHeader+", ."+d.scrollerFooter+" { position: relative; overflow: hidden; }."+d.scrollerHeader+" table."+d.table+" { margin-bottom: 0; }."+d.scrollerTable+" { position: relative; overflow: auto; }."+d.scrollerTable+" table."+d.table+" { border-top: 0; margin-top: 0; margin-bottom: 0; overflow: hidden; }."+d.scrollerTable+" tfoot, ."+d.scrollerHideElement+", ."+d.scrollerHideColumn+" { display: none; }."+d.scrollerFixed+", ."+d.scrollerFixed+" ."+d.scrollerFixedPanel+" { pointer-events: none; }."+d.scrollerFixed+" > div { pointer-events: all; }."+d.scrollerWrap+" ."+d.scrollerFixed+" { position: absolute; top: 0; z-index: 1; left: 0 } ."+d.scrollerWrap+" ."+d.scrollerFixed+"."+d.scrollerRtl+" { left: auto; right: 0 } ."+d.scrollerWrap+"."+d.scrollerHasFix+" > ."+d.scrollerTable+" { overflow: auto; }."+d.scrollerFixed+" ."+d.scrollerFooter+" { position: absolute; bottom: 0; }."+d.scrollerFixed+" ."+d.scrollerTable+" { position: relative; left: 0; overflow: auto; -ms-overflow-style: none; }."+d.scrollerFixed+" ."+d.scrollerTable+"::-webkit-scrollbar { display: none; }."+d.scrollerWrap+" ."+d.scrollerFixedPanel+" { position: absolute; top: 0; bottom: 0; z-index: 2; left: 0; right: 0; } </style>";a(b).appendTo("body")}),c.scroller={isFirefox:navigator.userAgent.toLowerCase().indexOf("firefox")>-1,isOldIE:document.all&&!b.atob,isIE:document.all&&!b.atob||navigator.appVersion.indexOf("Trident/")>0,isSafari:navigator.userAgent.toLowerCase().indexOf("safari")>-1&&-1===navigator.userAgent.toLowerCase().indexOf("chrome"),hasScrollBar:function(a,b){return b?a.get(0).scrollWidth>a.width():a.get(0).scrollHeight>a.height()},setWidth:function(a,b){a.css({width:b,"min-width":b,"max-width":b})},getBarWidth:function(){var b=a("<div>").css({position:"absolute",top:"-9999px",left:0,width:"100px",height:"100px",overflow:"scroll",visibility:"hidden"}).appendTo("body"),c=b[0],d=c.offsetWidth-c.clientWidth;return b.remove(),d},setup:function(e,f){var g,h,i,j,k,l,m,n,o=a(b),p=c.scroller,q=e.namespace+"tsscroller",r=a(),s=e.namespace.slice(1)+"tsscroller",t=e.$table;e.widthFixed=!0,f.scroller_calcWidths=[],f.scroller_isBusy=!0,f.scroller_barSetWidth=null!==f.scroller_barWidth?f.scroller_barWidth:p.getBarWidth()||15,g=f.scroller_height||300,i=a('<table class="'+t.attr("class")+'" cellpadding=0 cellspacing=0>'+t.children("thead")[0].outerHTML+"</table>"),f.scroller_$header=i.addClass(e.namespace.slice(1)+"_extra_table"),j=t.children("tfoot"),j.length&&(r=a('<table class="'+t.attr("class")+'" cellpadding=0 cellspacing=0 style="margin-top:0"></table>').addClass(e.namespace.slice(1)+"_extra_table").append(j.clone(!0)).wrap('<div class="'+d.scrollerFooter+'"/>'),l=r.children("tfoot").eq(0).children("tr").children()),f.scroller_$footer=r,t.wrap('<div id="'+s+'" class="'+d.scrollerWrap+'" />').before(i).find("."+d.filterRow).addClass(d.filterRowHide),f.scroller_$container=t.parent(),r.length&&t.after(r.parent()),k=i.wrap('<div class="'+d.scrollerHeader+'" />').find("."+d.header),t.wrap('<div class="'+d.scrollerTable+'" style="max-height:'+g+'px;" />'),m=t.parent(),c.bindEvents(e.table,k),t.hasClass("hasFilters")&&c.filter.bindSearch(t,i.find("."+d.filter)),t.find("thead").addClass(d.scrollerHideElement),h=m.parent().height(),m.off("scroll"+q).on("scroll"+q,function(){if(f.scroller_jumpToHeader){var b=o.scrollTop()-i.offset().top;0!==a(this).scrollTop()&&h>b&&b>0&&o.scrollTop(i.offset().top)}i.parent().add(r.parent()).scrollLeft(a(this).scrollLeft())}),n=((c.hasWidget(e.table,"filter")?"filterEnd":"tablesorter-initialized")+" updateComplete pagerComplete columnUpdate ").split(" ").join(q+" "),t.off(q).on("sortEnd"+q,function(){f.scroller_upAfterSort&&t.parent().animate({scrollTop:0},"fast")}).on("sortEnd filterEnd".split(" ").join(q+" "),function(a){setTimeout(function(){m.trigger("scroll")},0)}).on("setFixedColumnSize"+q,function(a,b){var c=f.scroller_$container;"undefined"==typeof b||isNaN(b)||(f.scroller_fixedColumns=parseInt(b,10)),p.removeFixed(e,f),b=f.scroller_fixedColumns,b>0&&b<e.columns-1?p.updateFixed(e,f):c.hasClass(d.scrollerHasFix)&&(c.removeClass(d.scrollerHasFix),p.resize(e,f))}).on(n,function(a){c.hasWidget("pager")&&"updateComplete"===a.type||(f.scroller_fixedColumns>0&&p.updateFixed(e,f,!1),p.resize(e,f))}),o.off("resize resizeEnd ".split(" ").join(q+" ")).on("resize"+q,c.window_resize).on("resizeEnd"+q,function(){o.off("resize"+q,c.window_resize),p.resize(e,f),o.on("resize"+q,c.window_resize),m.trigger("scroll"+q)}),e.isScrolling=!0,p.updateFixed(e,f)},resize:function(e,f){if(!f.scroller_isBusy){var g,h,i,j,k,l,m,n=c.scroller,o=f.scroller_$container,p=e.$table,q=p.parent(),r=f.scroller_$header,s=f.scroller_$footer,t=e.namespace.slice(1)+"tsscroller",u=a("div."+d.scrollerWrap+'[id!="'+t+'"]').addClass(d.scrollerHideElement),v='<tr class="'+d.scrollerSpacerRow+" "+e.selectorRemove.slice(1)+'">';for(f.scroller_calcWidths=[],n.removeFixed(e,f),o.find("."+d.scrollerSpacerRow).remove(),o.find("."+c.css.colgroup).remove(),p.find("."+d.scrollerHideElement).removeClass(d.scrollerHideElement),h=parseInt(p.css("border-left-width"),10),k=e.$headerIndexed,g=0;g<e.columns;g++)l=k[g],i="border-box"===l.css("box-sizing")?l.outerWidth():"collapse"===j.eq(g).css("border-collapse")?l.length&&b.getComputedStyle?parseFloat(b.getComputedStyle(l[0],null).width):l.outerWidth()-parseFloat(l.css("padding-left"))-parseFloat(l.css("padding-right"))-(parseFloat(l.css("border-width"))||0):l.width(),v+='<td data-column="'+g+'" style="padding:0;margin:0;border:0;height:0;max-height:0;min-height:0;width:'+i+"px;min-width:"+i+"px;max-width:"+i+'px"></td>',f.scroller_calcWidths[g]=i;v+="</tr>",e.$tbodies.eq(0).prepend(v),r.children("thead").append(v),s.children("tfoot").append(v),e.$table.trigger("resizableUpdate"),e.widthFixed&&(c.fixColumnWidth(e.table),v=e.$table.children("colgroup")[0].outerHTML,r.prepend(v),s.prepend(v)),m=q.parent().innerWidth()-(n.hasScrollBar(q)?f.scroller_barSetWidth:0),q.width(m),m=(n.hasScrollBar(q)?f.scroller_barSetWidth:0)+h,i=q.innerWidth()-m,r.parent().add(s.parent()).width(i),q.width(i+m),p.children("thead").addClass(d.scrollerHideElement),n.updateFixed(e,f),u.removeClass(d.scrollerHideElement)}},setupFixed:function(a,b){var e,f,g,h,i,j,k,l=a.$table,m=b.scroller_$container,n=b.scroller_fixedColumns;for(j=m.addClass(d.scrollerHasFix).clone().addClass(d.scrollerFixed).removeClass(d.scrollerWrap).attr("id",""),b.scroller_addFixedOverlay&&j.append('<div class="'+d.scrollerFixedPanel+'">'),k=j.find("."+d.scrollerTable),k.children("table").addClass(a.namespace.slice(1)+"_extra_table").attr("id","").children("thead, tfoot").remove(),b.scroller_$fixedColumns=j,l.hasClass(d.scrollerRtl)&&j.addClass(d.scrollerRtl),g=j.find("tr"),h=g.length,e=0;h>e;e++)g.eq(e).children(":gt("+(n-1)+")").remove();if(j.addClass(d.scrollerHideElement).prependTo(m),a.$table.hasClass("hasFilters"))for(g=j.find("."+d.filter).not("."+d.filterDisabled).prop("disabled",!1),c.filter.bindSearch(l,j.find("."+d.filter)),g=m.children("."+d.scrollerHeader).find("."+d.filter),h=g.length,e=0;h>e;e++)g.eq(e).hasClass(d.filterDisabled||"disabled")||g.eq(e).prop("disabled",n>e);for(a.$table.add("."+d.scrollerFooter+" table").children("thead").children("tr."+d.headerRow).children().attr("tabindex",-1),g=b.scroller_$header.add(j.find("."+d.scrollerTable+" table")).children("thead").children("tr."+d.headerRow),h=g.length,e=0;h>e;e++)for(i=g.eq(e).children(),f=0;f<i.length;f++)i.eq(f).attr("tabindex",n>f?-1:0);c.bindEvents(a.table,j.find("."+d.header)),c.scroller.bindFixedColumnEvents(a,b),(c.scroller.isFirefox||c.scroller.isOldIE)&&k.wrap('<div class="'+d.scrollerHack+'" style="overflow:hidden;">')},bindFixedColumnEvents:function(b,e){var f=c.scroller,g=b.namespace+"tsscrollerFixed",h="scroll"+g,i=e.scroller_$fixedColumns.find("."+d.scrollerTable),j=!0,k=!0;b.$table.parent().off(h).on(h,function(){e.scroller_isBusy||(j||!f.isFirefox&&!f.isIE)&&(k=!1,i[0].scrollTop=a(this).scrollTop(),setTimeout(function(){k=!0},20))}),i.off(h).on(h,function(){(k||!f.isFirefox&&!f.isIE)&&(j=!1,b.$table.parent()[0].scrollTop=a(this).scrollTop(),setTimeout(function(){j=!0},20))}).scroll(),""!==e.scroller_rowHighlight&&(h="mouseover mouseleave ".split(" ").join(g+" "),b.$table.off(h,"tbody > tr").on(h,"tbody > tr",function(a){var c=b.$table.children("tbody").children("tr").index(this);i.children("table").children("tbody").children("tr").eq(c).add(this).toggleClass(e.scroller_rowHighlight,"mouseover"===a.type)}),i.find("table").off(h,"tbody > tr").on(h,"tbody > tr",function(a){var c=i.children("table").children("tbody").children("tr"),d=c.index(this);b.$table.children("tbody").children("tr").eq(d).add(this).toggleClass(e.scroller_rowHighlight,"mouseover"===a.type)}))},adjustWidth:function(a,b,e,f,g){var h=b.scroller_$container;h.children("."+d.scrollerTable).css(g?"right":"left",e),h.children("."+d.scrollerHeader+", ."+d.scrollerFooter).css(g?"right":"left",e+(g&&c.scroller.isSafari?f:0))},updateFixed:function(b,e){var f,g,h=e.scroller_$container,i=e.scroller_$header,j=e.scroller_$footer,k=b.$table,l=k.parent(),m=e.scroller_barSetWidth,n=k.hasClass(d.scrollerRtl);if(0===e.scroller_fixedColumns)return e.scroller_isBusy=!1,c.scroller.removeFixed(b,e),f=h.width(),l.width(f),g=c.scroller.hasScrollBar(l)?m:0,void i.parent().add(j.parent()).width(f-g);if(b.isScrolling){e.scroller_isBusy=!0,h.find("."+d.scrollerFixed).length||c.scroller.setupFixed(b,e);var o,p,q,r,s,t,u,v=e.scroller_$container.children("."+d.scrollerTable).children("table").children("tbody"),w=e.scroller_$header.children("thead").children("."+d.headerRow),x=e.scroller_$fixedColumns.addClass(d.scrollerHideElement),y=x.find("."+d.scrollerTable).children("table"),z=y.children("tbody"),A=c.scroller,B=e.scroller_fixedColumns,C=k.find("tbody td"),D=parseInt(C.css("border-right-width"),10)||1,E=parseInt((C.css("border-spacing")||"").split(/\s/)[0],10)/2||0,F=parseInt(k.css("padding-left"),10)+parseInt(k.css("padding-right"),10)-D,G=e.scroller_calcWidths;for(c.scroller.removeFixed(b,e,!1),o=0;B>o;o++)F+=G[o]+E;for(F=F+2*D-E,A.setWidth(x.add(x.children()),F),A.setWidth(x.children().children("table"),F),p=0;p<b.$tbodies.length;p++)if(r=v.eq(p),r.length){for(w=r.children(),u=w.length,t=c.processTbody(y,z.eq(p),!0),t.empty(),q=0;u>q;q++)s=a(w[q].outerHTML),s.children("td, th").slice(B).remove(),t.append(s);c.processTbody(y,t,!1)}for(g=c.scroller.hasScrollBar(l)?m:0,(A.isFirefox||A.isOldIE)&&y.css("width",F).parent().css("width",F+g),x.removeClass(d.scrollerHideElement),o=0;B>o;o++)h.children("div").children("table").find("th:nth-child("+(o+1)+"), td:nth-child("+(o+1)+")").addClass(d.scrollerHideColumn);F-=D,f=l.parent().innerWidth()-F,l.width(f),h.children("."+d.scrollerTable).css(n?"right":"left",F),h.children("."+d.scrollerHeader+", ."+d.scrollerFooter).css(n?"right":"left",F+(n&&c.scroller.isSafari?g:0)),i.parent().add(j.parent()).width(f-g),f=c.scroller.hasScrollBar(l,!0),g=f?m:0,!x.find("."+d.scrollerBarSpacer).length&&f?(C=a('<div class="'+d.scrollerBarSpacer+'">').css("height",g+"px"),x.find("."+d.scrollerTable).append(C)):f||x.find("."+d.scrollerBarSpacer).remove(),c.scroller.updateRowHeight(b,e),x.height(h.height()),x.removeClass(d.scrollerHideElement),e.scroller_isBusy=!1}},fixHeight:function(a,b){var c,e,f,g,h,i=a.length;for(c=0;i>c;c++)g=a.eq(c),h=b.eq(c),e=g.height(),f=h.height(),e>f?h.addClass(d.scrollerAddedHeight).height(e):f>e&&g.addClass(d.scrollerAddedHeight).height(f)},updateRowHeight:function(a,b){var e,f,g=b.scroller_$fixedColumns;b.scroller_$container.find("."+d.scrollerAddedHeight).removeClass(d.scrollerAddedHeight).height(""),e=b.scroller_$header.children("thead").children("tr"),f=g.children("."+d.scrollerHeader).children("table").children("thead").children("tr"),c.scroller.fixHeight(e,f),e=b.scroller_$footer.children("tfoot").children("tr"),f=g.children("."+d.scrollerFooter).children("table").children("tfoot").children("tr"),c.scroller.fixHeight(e,f),(c.scroller.isFirefox||c.scroller.isOldIE)&&(g=g.find("."+d.scrollerHack)),e=a.$table.children("tbody").children("tr"),f=g.children("."+d.scrollerTable).children("table").children("tbody").children("tr"),c.scroller.fixHeight(e,f)},removeFixed:function(a,b,c){var e=a.$table,f=b.scroller_$container,g=e.hasClass(d.scrollerRtl);(c||"undefined"==typeof c)&&f.find("."+d.scrollerFixed).remove(),f.find("."+d.scrollerHideColumn).removeClass(d.scrollerHideColumn),f.children(":not(."+d.scrollerFixed+")").css(g?"right":"left",0)},remove:function(c,e){var f=e.scroller_$container,g=c.namespace+"tsscroller";c.$table.off(g).insertBefore(f).find("thead").removeClass(d.scrollerHideElement).children("tr."+d.headerRow).children().attr("tabindex",0).end().find("."+d.filterRow).removeClass(d.scrollerHideElement+" "+d.filterRowHide),c.$table.find("."+d.filter).not("."+d.filterDisabled).prop("disabled",!1),f.remove(),a(b).off(g),c.isScrolling=!1}}}(jQuery,window);
\ No newline at end of file
+!function(a,b){"use strict";var c=a.tablesorter,d=c.css;a.extend(c.css,{scrollerWrap:"tablesorter-scroller",scrollerHeader:"tablesorter-scroller-header",scrollerTable:"tablesorter-scroller-table",scrollerFooter:"tablesorter-scroller-footer",scrollerFixed:"tablesorter-scroller-fixed",scrollerFixedPanel:"tablesorter-scroller-fixed-panel",scrollerHasFix:"tablesorter-scroller-has-fixed-columns",scrollerHideColumn:"tablesorter-scroller-hidden-column",scrollerHideElement:"tablesorter-scroller-hidden",scrollerSpacerRow:"tablesorter-scroller-spacer",scrollerBarSpacer:"tablesorter-scroller-bar-spacer",scrollerAddedHeight:"tablesorter-scroller-added-height",scrollerHack:"tablesorter-scroller-scrollbar-hack",scrollerRtl:"ts-scroller-rtl"}),c.addWidget({id:"scroller",priority:60,options:{scroller_height:300,scroller_jumpToHeader:!0,scroller_upAfterSort:!0,scroller_fixedColumns:0,scroller_rowHighlight:"hover",scroller_addFixedOverlay:!1,scroller_barWidth:null},format:function(a,b,d){b.isScrolling||c.scroller.setup(b,d)},remove:function(a,b,d){c.scroller.remove(b,d)}}),c.window_resize=function(){c.timer_resize&&clearTimeout(c.timer_resize),c.timer_resize=setTimeout(function(){a(b).trigger("resizeEnd")},250)},a(function(){var b="<style>."+d.scrollerWrap+" { position: relative; overflow: hidden; }."+d.scrollerWrap+" * { box-sizing: border-box; }."+d.scrollerHeader+", ."+d.scrollerFooter+" { position: relative; overflow: hidden; }."+d.scrollerHeader+" table."+d.table+" { margin-bottom: 0; }."+d.scrollerTable+" { position: relative; overflow: auto; }."+d.scrollerTable+" table."+d.table+" { border-top: 0; margin-top: 0; margin-bottom: 0; overflow: hidden; }."+d.scrollerTable+" tfoot, ."+d.scrollerHideElement+", ."+d.scrollerHideColumn+" { display: none; }."+d.scrollerFixed+", ."+d.scrollerFixed+" ."+d.scrollerFixedPanel+" { pointer-events: none; }."+d.scrollerFixed+" > div { pointer-events: all; }."+d.scrollerWrap+" ."+d.scrollerFixed+" { position: absolute; top: 0; z-index: 1; left: 0 } ."+d.scrollerWrap+" ."+d.scrollerFixed+"."+d.scrollerRtl+" { left: auto; right: 0 } ."+d.scrollerWrap+"."+d.scrollerHasFix+" > ."+d.scrollerTable+" { overflow: auto; }."+d.scrollerFixed+" ."+d.scrollerFooter+" { position: absolute; bottom: 0; }."+d.scrollerFixed+" ."+d.scrollerTable+" { position: relative; left: 0; overflow: auto; -ms-overflow-style: none; }."+d.scrollerFixed+" ."+d.scrollerTable+"::-webkit-scrollbar { display: none; }."+d.scrollerWrap+" ."+d.scrollerFixedPanel+" { position: absolute; top: 0; bottom: 0; z-index: 2; left: 0; right: 0; } </style>";a(b).appendTo("body")}),c.scroller={isFirefox:navigator.userAgent.toLowerCase().indexOf("firefox")>-1,isOldIE:document.all&&!b.atob,isIE:document.all&&!b.atob||navigator.appVersion.indexOf("Trident/")>0,isSafari:navigator.userAgent.toLowerCase().indexOf("safari")>-1&&-1===navigator.userAgent.toLowerCase().indexOf("chrome"),hasScrollBar:function(a,b){return b?a.get(0).scrollWidth>a.width():a.get(0).scrollHeight>a.height()},setWidth:function(a,b){a.css({width:b,"min-width":b,"max-width":b})},getBarWidth:function(){var b=a("<div>").css({position:"absolute",top:"-9999px",left:0,width:"100px",height:"100px",overflow:"scroll",visibility:"hidden"}).appendTo("body"),c=b[0],d=c.offsetWidth-c.clientWidth;return b.remove(),d},setup:function(e,f){var g,h,i,j,k,l,m,n,o=a(b),p=c.scroller,q=e.namespace+"tsscroller",r=a(),s=e.namespace.slice(1)+"tsscroller",t=e.$table;e.widthFixed=!0,f.scroller_calcWidths=[],f.scroller_saved=[0,0],f.scroller_isBusy=!0,f.scroller_barSetWidth=null!==f.scroller_barWidth?f.scroller_barWidth:p.getBarWidth()||15,g=f.scroller_height||300,i=a('<table class="'+t.attr("class")+'" cellpadding=0 cellspacing=0>'+t.children("thead")[0].outerHTML+"</table>"),f.scroller_$header=i.addClass(e.namespace.slice(1)+"_extra_table"),j=t.children("tfoot"),j.length&&(r=a('<table class="'+t.attr("class")+'" cellpadding=0 cellspacing=0 style="margin-top:0"></table>').addClass(e.namespace.slice(1)+"_extra_table").append(j.clone(!0)).wrap('<div class="'+d.scrollerFooter+'"/>'),l=r.children("tfoot").eq(0).children("tr").children()),f.scroller_$footer=r,t.wrap('<div id="'+s+'" class="'+d.scrollerWrap+'" />').before(i).find("."+d.filterRow).addClass(d.filterRowHide),f.scroller_$container=t.parent(),r.length&&t.after(r.parent()),k=i.wrap('<div class="'+d.scrollerHeader+'" />').find("."+d.header),t.wrap('<div class="'+d.scrollerTable+'" style="max-height:'+g+'px;" />'),m=t.parent(),c.bindEvents(e.table,k),t.hasClass("hasFilters")&&c.filter.bindSearch(t,i.find("."+d.filter)),t.find("thead").addClass(d.scrollerHideElement),h=m.parent().height(),m.off("scroll"+q).on("scroll"+q,function(){if(f.scroller_jumpToHeader){var b=o.scrollTop()-i.offset().top;0!==a(this).scrollTop()&&h>b&&b>0&&o.scrollTop(i.offset().top)}i.parent().add(r.parent()).scrollLeft(a(this).scrollLeft())}),n=((c.hasWidget(e.table,"filter")?"filterEnd":"tablesorter-initialized")+" updateComplete pagerComplete columnUpdate ").split(" ").join(q+" "),t.off(q).on("sortEnd filterEnd".split(" ").join(q+" "),function(a){"sortEnd"===a.type&&f.scroller_upAfterSort?m.animate({scrollTop:0},"fast"):f.scroller_fixedColumns&&setTimeout(function(){m.scrollTop(f.scroller_saved[1]).scrollLeft(f.scroller_saved[0]),p.updateFixed(e,f,!1)},0)}).on("setFixedColumnSize"+q,function(a,b){var c=f.scroller_$container;"undefined"==typeof b||isNaN(b)||(f.scroller_fixedColumns=parseInt(b,10)),p.removeFixed(e,f),b=f.scroller_fixedColumns,b>0&&b<e.columns-1?p.updateFixed(e,f):c.hasClass(d.scrollerHasFix)&&(c.removeClass(d.scrollerHasFix),p.resize(e,f))}).on(n,function(a){c.hasWidget("pager")&&"updateComplete"===a.type||(f.scroller_fixedColumns>0&&p.updateFixed(e,f,!1),p.resize(e,f))}),o.off("resize resizeEnd ".split(" ").join(q+" ")).on("resize"+q,c.window_resize).on("resizeEnd"+q,function(){o.off("resize"+q,c.window_resize),p.resize(e,f),o.on("resize"+q,c.window_resize),m.trigger("scroll"+q)}),e.isScrolling=!0,p.updateFixed(e,f)},resize:function(e,f){if(!f.scroller_isBusy){var g,h,i,j,k,l,m,n=c.scroller,o=f.scroller_$container,p=e.$table,q=p.parent(),r=f.scroller_$header,s=f.scroller_$footer,t=e.namespace.slice(1)+"tsscroller",u=a("div."+d.scrollerWrap+'[id!="'+t+'"]').addClass(d.scrollerHideElement),v='<tr class="'+d.scrollerSpacerRow+" "+e.selectorRemove.slice(1)+'">';for(f.scroller_calcWidths=[],n.removeFixed(e,f),o.find("."+d.scrollerSpacerRow).remove(),o.find("."+c.css.colgroup).remove(),p.find("."+d.scrollerHideElement).removeClass(d.scrollerHideElement),h=parseInt(p.css("border-left-width"),10),k=e.$headerIndexed,g=0;g<e.columns;g++)l=k[g],i="border-box"===l.css("box-sizing")?l.outerWidth():"collapse"===j.eq(g).css("border-collapse")?l.length&&b.getComputedStyle?parseFloat(b.getComputedStyle(l[0],null).width):l.outerWidth()-parseFloat(l.css("padding-left"))-parseFloat(l.css("padding-right"))-(parseFloat(l.css("border-width"))||0):l.width(),v+='<td data-column="'+g+'" style="padding:0;margin:0;border:0;height:0;max-height:0;min-height:0;width:'+i+"px;min-width:"+i+"px;max-width:"+i+'px"></td>',f.scroller_calcWidths[g]=i;v+="</tr>",e.$tbodies.eq(0).prepend(v),r.children("thead").append(v),s.children("tfoot").append(v),e.$table.trigger("resizableUpdate"),e.widthFixed&&(c.fixColumnWidth(e.table),v=e.$table.children("colgroup")[0].outerHTML,r.prepend(v),s.prepend(v)),m=q.parent().innerWidth()-(n.hasScrollBar(q)?f.scroller_barSetWidth:0),q.width(m),m=(n.hasScrollBar(q)?f.scroller_barSetWidth:0)+h,i=q.innerWidth()-m,r.parent().add(s.parent()).width(i),q.width(i+m),p.children("thead").addClass(d.scrollerHideElement),n.updateFixed(e,f),u.removeClass(d.scrollerHideElement)}},setupFixed:function(a,b){var e,f,g,h,i,j,k,l=a.$table,m=b.scroller_$container,n=b.scroller_fixedColumns;for(j=m.addClass(d.scrollerHasFix).clone().addClass(d.scrollerFixed).removeClass(d.scrollerWrap).attr("id",""),b.scroller_addFixedOverlay&&j.append('<div class="'+d.scrollerFixedPanel+'">'),k=j.find("."+d.scrollerTable),k.children("table").addClass(a.namespace.slice(1)+"_extra_table").attr("id","").children("thead, tfoot").remove(),b.scroller_$fixedColumns=j,l.hasClass(d.scrollerRtl)&&j.addClass(d.scrollerRtl),g=j.find("tr"),h=g.length,e=0;h>e;e++)g.eq(e).children(":gt("+(n-1)+")").remove();if(j.addClass(d.scrollerHideElement).prependTo(m),a.$table.hasClass("hasFilters"))for(g=j.find("."+d.filter).not("."+d.filterDisabled).prop("disabled",!1),c.filter.bindSearch(l,j.find("."+d.filter)),g=m.children("."+d.scrollerHeader).find("."+d.filter),h=g.length,e=0;h>e;e++)g.eq(e).hasClass(d.filterDisabled||"disabled")||g.eq(e).prop("disabled",n>e);for(a.$table.add("."+d.scrollerFooter+" table").children("thead").children("tr."+d.headerRow).children().attr("tabindex",-1),g=b.scroller_$header.add(j.find("."+d.scrollerTable+" table")).children("thead").children("tr."+d.headerRow),h=g.length,e=0;h>e;e++)for(i=g.eq(e).children(),f=0;f<i.length;f++)i.eq(f).attr("tabindex",n>f?-1:0);c.bindEvents(a.table,j.find("."+d.header)),c.scroller.bindFixedColumnEvents(a,b),(c.scroller.isFirefox||c.scroller.isOldIE)&&k.wrap('<div class="'+d.scrollerHack+'" style="overflow:hidden;">')},bindFixedColumnEvents:function(b,e){var f=c.scroller,g=b.namespace+"tsscrollerFixed",h="scroll"+g,i=e.scroller_$fixedColumns.find("."+d.scrollerTable),j=!0,k=!0;b.$table.parent().off(h).on(h,function(){if(!e.scroller_isBusy&&(j||!f.isFirefox&&!f.isIE)){k=!1;var b=a(this);i[0].scrollTop=e.scroller_saved[1]=b.scrollTop(),e.scroller_saved[0]=b.scrollLeft(),setTimeout(function(){k=!0},20)}}),i.off(h).on(h,function(){if(k||!f.isFirefox&&!f.isIE){j=!1;var c=a(this);b.$table.parent()[0].scrollTop=e.scroller_saved[1]=c.scrollTop(),setTimeout(function(){j=!0},20)}}).scroll(),""!==e.scroller_rowHighlight&&(h="mouseover mouseleave ".split(" ").join(g+" "),b.$table.off(h,"tbody > tr").on(h,"tbody > tr",function(a){var c=b.$table.children("tbody").children("tr").index(this);i.children("table").children("tbody").children("tr").eq(c).add(this).toggleClass(e.scroller_rowHighlight,"mouseover"===a.type)}),i.find("table").off(h,"tbody > tr").on(h,"tbody > tr",function(a){var c=i.children("table").children("tbody").children("tr"),d=c.index(this);b.$table.children("tbody").children("tr").eq(d).add(this).toggleClass(e.scroller_rowHighlight,"mouseover"===a.type)}))},adjustWidth:function(a,b,e,f,g){var h=b.scroller_$container;h.children("."+d.scrollerTable).css(g?"right":"left",e),h.children("."+d.scrollerHeader+", ."+d.scrollerFooter).css(g?"right":"left",e+(g&&c.scroller.isSafari?f:0))},updateFixed:function(b,e){var f,g,h=e.scroller_$container,i=e.scroller_$header,j=e.scroller_$footer,k=b.$table,l=k.parent(),m=e.scroller_barSetWidth,n=k.hasClass(d.scrollerRtl);if(0===e.scroller_fixedColumns)return e.scroller_isBusy=!1,c.scroller.removeFixed(b,e),f=h.width(),l.width(f),g=c.scroller.hasScrollBar(l)?m:0,void i.parent().add(j.parent()).width(f-g);if(b.isScrolling){e.scroller_isBusy=!0,h.find("."+d.scrollerFixed).length||c.scroller.setupFixed(b,e);var o,p,q,r,s,t,u,v=e.scroller_$container.children("."+d.scrollerTable).children("table").children("tbody"),w=e.scroller_$header.children("thead").children("."+d.headerRow),x=e.scroller_$fixedColumns.addClass(d.scrollerHideElement),y=x.find("."+d.scrollerTable).children("table"),z=y.children("tbody"),A=c.scroller,B=e.scroller_fixedColumns,C=k.find("tbody td"),D=parseInt(C.css("border-right-width"),10)||1,E=parseInt((C.css("border-spacing")||"").split(/\s/)[0],10)/2||0,F=parseInt(k.css("padding-left"),10)+parseInt(k.css("padding-right"),10)-D,G=e.scroller_calcWidths;for(c.scroller.removeFixed(b,e,!1),o=0;B>o;o++)F+=G[o]+E;for(F=F+2*D-E,A.setWidth(x.add(x.children()),F),A.setWidth(x.children().children("table"),F),p=0;p<b.$tbodies.length;p++)if(r=v.eq(p),r.length){for(w=r.children(),u=w.length,t=c.processTbody(y,z.eq(p),!0),t.empty(),q=0;u>q;q++)s=a(w[q].outerHTML),s.children("td, th").slice(B).remove(),t.append(s);c.processTbody(y,t,!1)}for(g=c.scroller.hasScrollBar(l)?m:0,(A.isFirefox||A.isOldIE)&&y.css("width",F).parent().css("width",F+g),x.removeClass(d.scrollerHideElement),o=0;B>o;o++)h.children("div").children("table").find("th:nth-child("+(o+1)+"), td:nth-child("+(o+1)+")").addClass(d.scrollerHideColumn);F-=D,f=l.parent().innerWidth()-F,l.width(f),h.children("."+d.scrollerTable).css(n?"right":"left",F),h.children("."+d.scrollerHeader+", ."+d.scrollerFooter).css(n?"right":"left",F+(n&&c.scroller.isSafari?g:0)),i.parent().add(j.parent()).width(f-g),f=c.scroller.hasScrollBar(l,!0),g=f?m:0,!x.find("."+d.scrollerBarSpacer).length&&f?(C=a('<div class="'+d.scrollerBarSpacer+'">').css("height",g+"px"),x.find("."+d.scrollerTable).append(C)):f||x.find("."+d.scrollerBarSpacer).remove(),c.scroller.updateRowHeight(b,e),x.height(h.height()),x.removeClass(d.scrollerHideElement),e.scroller_isBusy=!1}},fixHeight:function(a,b){var c,e,f,g,h,i=a.length;for(c=0;i>c;c++)g=a.eq(c),h=b.eq(c),e=g.height(),f=h.height(),e>f?h.addClass(d.scrollerAddedHeight).height(e):f>e&&g.addClass(d.scrollerAddedHeight).height(f)},updateRowHeight:function(a,b){var e,f,g=b.scroller_$fixedColumns;b.scroller_$container.find("."+d.scrollerAddedHeight).removeClass(d.scrollerAddedHeight).height(""),e=b.scroller_$header.children("thead").children("tr"),f=g.children("."+d.scrollerHeader).children("table").children("thead").children("tr"),c.scroller.fixHeight(e,f),e=b.scroller_$footer.children("tfoot").children("tr"),f=g.children("."+d.scrollerFooter).children("table").children("tfoot").children("tr"),c.scroller.fixHeight(e,f),(c.scroller.isFirefox||c.scroller.isOldIE)&&(g=g.find("."+d.scrollerHack)),e=a.$table.children("tbody").children("tr"),f=g.children("."+d.scrollerTable).children("table").children("tbody").children("tr"),c.scroller.fixHeight(e,f)},removeFixed:function(a,b,c){var e=a.$table,f=b.scroller_$container,g=e.hasClass(d.scrollerRtl);(c||"undefined"==typeof c)&&f.find("."+d.scrollerFixed).remove(),f.find("."+d.scrollerHideColumn).removeClass(d.scrollerHideColumn),f.children(":not(."+d.scrollerFixed+")").css(g?"right":"left",0)},remove:function(c,e){var f=e.scroller_$container,g=c.namespace+"tsscroller";c.$table.off(g).insertBefore(f).find("thead").removeClass(d.scrollerHideElement).children("tr."+d.headerRow).children().attr("tabindex",0).end().find("."+d.filterRow).removeClass(d.scrollerHideElement+" "+d.filterRowHide),c.$table.find("."+d.filter).not("."+d.filterDisabled).prop("disabled",!1),f.remove(),a(b).off(g),c.isScrolling=!1}}}(jQuery,window);
\ No newline at end of file
diff --git a/js/widgets/widget-scroller.js b/js/widgets/widget-scroller.js
index 8bbc0d12..63f7654e 100644
--- a/js/widgets/widget-scroller.js
+++ b/js/widgets/widget-scroller.js
@@ -199,6 +199,7 @@ ts.scroller = {
 		c.widthFixed = true;
 
 		wo.scroller_calcWidths = [];
+		wo.scroller_saved = [ 0, 0 ];
 		wo.scroller_isBusy = true;
 
 		// set scrollbar width & allow setting width to zero
@@ -282,19 +283,22 @@ ts.scroller = {
 
 		$table
 			.off( namespace )
-			.on( 'sortEnd' + namespace, function() {
+			.on( 'sortEnd filterEnd'.split( ' ' ).join( namespace + ' ' ), function( event ) {
 				// Sorting, so scroll to top
-				if ( wo.scroller_upAfterSort ) {
-					$table.parent().animate({
+				if ( event.type === 'sortEnd' && wo.scroller_upAfterSort ) {
+					$tableWrap.animate({
 						scrollTop : 0
 					}, 'fast' );
+				} else if ( wo.scroller_fixedColumns ) {
+					setTimeout( function() {
+						// restore previous scroll position
+						$tableWrap
+							.scrollTop( wo.scroller_saved[1] )
+							.scrollLeft( wo.scroller_saved[0] );
+						tsScroller.updateFixed( c, wo, false );
+					}, 0 );
 				}
 			})
-			.on( 'sortEnd filterEnd'.split( ' ' ).join( namespace + ' ' ), function(e) {
-				setTimeout(function(){
-					$tableWrap.trigger( 'scroll' );
-				}, 0);
-			})
 			.on( 'setFixedColumnSize' + namespace, function( event, size ) {
 				var $wrap = wo.scroller_$container;
 				if ( typeof size !== 'undefined' && !isNaN( size ) ) {
@@ -553,7 +557,9 @@ ts.scroller = {
 				// using flags to prevent firing the scroll event excessively leading to slow scrolling in Firefox
 				if ( fixedScroll || !( tsScroller.isFirefox || tsScroller.isIE ) ) {
 					tableScroll = false;
-					$fixedTbody[0].scrollTop = $( this ).scrollTop();
+					var $this = $( this );
+					$fixedTbody[0].scrollTop = wo.scroller_saved[1] = $this.scrollTop();
+					wo.scroller_saved[0] = $this.scrollLeft();
 					setTimeout( function() {
 						tableScroll = true;
 					}, 20 );
@@ -566,7 +572,8 @@ ts.scroller = {
 				// using flags to prevent firing the scroll event excessively leading to slow scrolling in Firefox
 				if ( tableScroll || !( tsScroller.isFirefox || tsScroller.isIE ) ) {
 					fixedScroll = false;
-					c.$table.parent()[0].scrollTop = $( this ).scrollTop();
+					var $this = $( this );
+					c.$table.parent()[0].scrollTop = wo.scroller_saved[1] = $this.scrollTop();
 					setTimeout( function() {
 						fixedScroll = true;
 					}, 20 );