you complicated it. After I-140, all (primary) applicants (H1, F1, J1 ...) answer "yes", regardless 485; For spouses (H1/4, F1/2, J1/2 ... ), answer "no" before sub-mitting 485, then "yes"