fixes and issue where non-deleted records are not found

Pretty sure this should be `null` unless I'm _doing it wrong_.