CRM-12762 Improvement (Removed use of getTree due to permission issues)