Added expandAll and search methods