Latest changes to fix pattern/strategies and fix patient joins for viewing images.