Fix join/populate subcriteria normalization in operations-shim
Cleanup/fixes/logs
Comment out log