Bug fix - NoSuchElementException while filtering date