Updated single/singleOrDefault according to review request