Fix issue with empty entries in the result.