Modify filtering to handle simple dates