Tighten up conditional logic fetching, soft-delete records, and do single-query fetches