Avoid text-based selector in map.

Another instance where checking for specific text within a tag is unreliable and messes up the mapping tests; replaced with one that uses item attributes.  Also cleaned up the whitespace in GRCObject file.