Changed org query to include public and current org (self)