improved tags formatting