beef up criteria normalization
better handle populate where clauses. #334