cleanup + fix regex so it workish. fails miserably if the clients send an empty override cookie, but enough is enough