added deleted_at parameter to where queries (not sure if I caught them all).