reverted back to pre simple form version. also fixed displaying of duplicate events.