Remove hard-coded column names
Merge branch 'master' into dalliance-integration
Revert "Remove hard-coded column names"

This reverts commit 225ed3bb0752e37cc9d01ef4b35005a8795f9ed6.
Display "loading" spinner in front-end only version