Remove extra regular expression replacement run

Instead of running the regular expression a second time using `Replace`,
just look if a OrderBy part was found before and if that's the case,
remove it using a simple string replacement.

Previously, the regular expression could easily be a bottle neck when
executing a paged query.