Avoid text-based selector in map.
Merge pull request #14 from dtzinov/failures-01-21-14

Avoid text-based selector in map.