Reopening, turns out the fix didn't account for cases where you have ?cid= (e.g. empty).