Jonathan beat me to it (I started rewriting the procedure into dynamic SQL and got busy with other things). Here's another blog post on the subject http://sqlinthewild.co.za/index.php/2009/03/19/catch-all-queries/
Gail Shaw
Microsoft Certified Master: SQL Server, MVP, M.Sc (Comp Sci)
SQL In The Wild: Discussions on DB performance with occasional diversions into recoverability