More CIP bugs

Fix bugs with non-published CIPs being displayed, and error on setting Limited access.

https://www.pivotaltracker.com/story/show/71009194
https://www.pivotaltracker.com/story/show/70929980