#418 (bug) - ";" Character in Event
#422 (bug) - Overidden layout rendering bug fix