Search works again #SGoo-57 Fixed