Reverted back to semi-working state

Revert "Fixed further problems with rendering"

This reverts commit 46b3b08e02155e0dfc2fa985dc12ef0616a85cde.

Revert "Disabled relevence enforce in web form until corrected"

This reverts commit b23150e202766be8c584454ff7621f526071dd9f.

Revert "Fixes for table queries"

This reverts commit 14245b81784d8d69fbee5638e6b87347af4e7ee6.