Updated: fix Match[attribute_<attribute_identifier>] not working