Product shortcode patch to resolve #6654 - refactoring product listing methods, adding product_tag shortcode, options for css class and result count display