Ensure correct use_* values when matching tables have no data

[margrietpalm]

I used rebase instead of merge with the parent branch and that seems to have resulted in moving the commits :(.