Search & discovery App load correct image option from a colour swatch

[Shane_h]

so racking my brains here 🤔 spent many hours with no joy

so i am using the shopify search and discovery app as the main filters, its picking up and loading the correct image  option when you choose the colour from textual menu as you can see here - i select yellow and it loads the 3 products and displays the yellow variants im guessing its picking up from the base colour

now for the colour swatch below i created if i select yellow it selects the products available in yellow but does not load the relevant product image - this i feel would be confusing for customers as you can see below in the image the three products have a yellow option 

this is the URL https://kitout-fitness.co.uk/collections/kitout-custom-kits - theme is Charge

does anyone have any idea please of how i could acheive this with the swatches

Thanks and regards Shane

[Shane_h]

Thank-you for your reply unfortunately thats not  an option  but thanks for offering  your services 

[Shane_h]

Any shopify developers that can pick up on this ?