fixes in global keyword extraction