content refactor fixes