make constituency matcher a bit more robust