fixed filtering by year(after and before)
Merge branch '24077_fix_filtering_by_year' into develop