Fixed a bug with the user_has_shop location rule for ACF showing up in the wrong places
Better handling of custom checkout, cart and my account pages for subshops