Fix #551 and also recursively search the tree when matching mbeans