Moved time formating to a filter