Adds ability to query Metrics with #date query syntax; removes all eventDate field annotations