[squash] more not_found handling