make sure excluded fields are not a part of only
Merge branch 'fix-only' into closeio