JFUSION-146 #comment fix for pagination, untested since i can recreate
few other code syntax and code clean up preformed.