change tags and add a dedicated metric for graphing