Storefront: refactoring of listing block controller