Updated with a minor bugfix for universal_search.