more work on keyword map