Merge 2 calendar querying widgets

Merge 2 calendar querying widgets