Remove requirement to search/all