canned queries now return both original id and mapped name