Fix performance issue when loading catalog tree.
Merge pull request #177 from bendiy/master

Fix performance issue when loading catalog tree.