Bug Fix; Search on empty list will no longer throw any error

Signed-off-by: bsubramaniam <bsubramaniam@freshdesk.com>