Better empty cookie handling support