BroadleafCommerce/BroadleafCommerce#659 - Reorganize filters