LPS-48256 SF

Hey Adam,

The PR looks good to me. However I couldn't make it work. I've added a new calendar and then I tried to search for it but I had no results. Maybe it's a ES issue?

Please fix this and send the PR to @eduardolundgren.

Regards,