Tagging: adjusted logic for handling key names and plural names, as well as for tabs and URLs.