Fix deepfetch problems

gitlabsos fails for some clients due to various assumptions made by the code, principally concerning the deep_fetch call.

Latest example here: https://gitlab.zendesk.com/agent/tickets/140532