Add fallback to avoid infinitive loops, ref #135
Change history view item description to something more meaningful, ref #135