Only check on listed identifier types for a match. closes #461