Fixed recent change to submodel matching conditions; was causing projections to be skipped