#85 remove @normal from *Entry elements