Merge pull request #586 from DarkSide666/master

changes in Paginator and QuickSearch