Improve robustness of excerpt finding
Add comment describing excerpt bug