Billing and Shipping addresses problems

-- HikaShop version -- : 3.0.1
-- Joomla version -- : 3.6.5
-- PHP version -- : 7.0

Hello!
I use new checkout system. I like it but I have a problem with billing and shipping addresses.
My problem is:
I have both addresses selected. When I change one, the second changes too - I attached pictures. When I have 4 addresses ( the same 2 addresses in 2 columns) - it became possible to select which address I want. But 4 addresses are too much)))

The question is:
- Is there any possibility to display only one billing or shipping address? And allow customers to change it as need.
- Or to show checkbox "The same as billing address" - as in old checkout?


Regards, Olga

Hello, Philip!

Thank You for Your answer!

I changed my template to template Protostar - selector's behavior the same as with my template. I attached a picture.
My site is dostavkafili.ru
If You need access references to back-end I can send it to You.

Regards, Olga

Hello!
Thank You for advices - I tried but it didn't fix problems... So I found my own solution. Maybe it'll be helpful for somebody...
I need only one address ( shipping address ) for my customers on this project. So I made the second address invisible by css rules ))))

If somebody needs, css rules are here :
.hkc-sm-6.hkc-xs-12 {display:block; width:100%!important; margin:auto; text-align:center; padding-left:10%; padding-right:10%;}
fieldset.hika_address_field.hikashop_checkout_shipping_address_block {visibility: hidden;height: 10px;}

Thank You so much!
Olga