Some fixes on displaying excerpt