Updated limit / search for pagination in remaining modules