Filter on the shortcode products query
Merge pull request #3627 from Geczy/master

Filter on the shortcode products query