fixed excerpt data loading
cleaned code
Merge branch 'hotfix/excerpt'