Improve cookie handling (but no support for shopping cart yet)