Fixes CW-505 and CW-693 - Content selection view bugfixes