Improve performance and fix sisue with Pick setup_related_objects