Fix order screen
Fix filters for shopping forms
Merge branch 'develop' into feature/cart-quantity