BS-8842, add the possibility of use partial match