Change date-search field to FIRST_OCCURRENCE, which is more accurate than filtering based on the reported date
fix conflixts