Added time shortcuts and year filter