Issue #2096361 by bendiy: change the product match function from using a db_select() to an EntityFieldQuery with a related query alter.