[FIX][ISSUE 617508] Force Category on product search
[MERGE][TICKET 617508] TOS: don't ignore category on product search