Needs UI - Clean up and set default for visibility_id