fix entity for RSS; other little cleanup