Fixed lazy classes tree and searching in instance tree.

Change-Id: I31a3691de65166d71cbe8c5e3c311e9c25a946af