Add search support and other little tweaks such as global pagination