improve spree_multi_site for spree 2.4