Actually properly handle calendar searching. This also fixes #11.

Relates to GH #14 and GH #15