disc tag fields fix
code cleanup