Magento 2 Improved Sorting