Changing to use newly renamed column concepts from Search
Merge branch 'master' of https://github.com/Apelon-VA/ISAAC.git