Keep cid query string, flip extras if logic

* For full backwards compat if no extras are specified append cid as
  query string
* Flip logic around detecting if extras is empty for better readability.