fixed bug in combined view: excerpts sometimes didn't disappear after expanding; some consolidations