Ensure first comment/annotation always shows up
Attempt to simplify portal templates
More experiments with search highlighting