Server-Side Patch

This is a experiment to fix the slow query  times, looking mainly for
non-modified server-side RPT logs.