Removed specialized search wrappers and renamed