tweak query order and date test logic
update event icons