Keyword map refinement

Added missing keywords.xml file and inserted only xml element value in
the key map.  (Tag names were being inserted)