inputtags fix
tiny refactors