Thanks for the tips guys, I'll be plodding through them shortly with my fingers crossed!

I especially like the dynamic query one... that'd really make creation of such a queries easier in future! Probably make them much more readable too... sorry about such a nightmare of a sproc! The only defense I have is how rare it is I do anything other than the real basic CRUD stuff.

I'll see if re-working the catchall yeilds any joy, along with maybe throwing in the OPTION (RECOMPILE) pretty soonish as that seems quite a quick and easy avenue.

Thank you!