Use new render_instance_selector helper