Update to search using selected option in settings