BS-8842, fix partial match