fix id criteria on populate, tests for that fix.