better handling of empty results