Fix case where return_one query has zero results