Comment 16 for bug 607960

Doing that takes 1.5 seconds off, without changing the %foo% clause, and returns the same number of rows on staging. (1745ms)
Changing to use the sourcepackagename and product names in like seems to be less of a win, so deferring that for now. (2400ms)