Fix issue with search filtering hanging due to handler being applied on every search
Clean code, fix links on pagination
Merge remote-tracking branch 'origin/master'