Resolved #6 : drill down feature, Resolved #7