Updated to return list when no search field can be found