Updated return values in search