Fix comparrison of items in calendar report
Merge branch 'staging'