Merging these two branches concerning the encylopedia complex search