fix boar matching with connection (WIP)