Issue #2330557 by DanChadwick: Added Replace hard-coded tables with views.