code cleaning, start of aggregating tags in the WebServer