LPS-35271 / LPS-35486 -  Use "pm" suffix instead of "p" for events
LPS-35271 / LPS-35490 -  Differentiate beteween past and future events
Source formatting