Added debug logging & ignore empty results