Various product search updates

Can’t add to basket yet