move back some old stuff so we get back old version that we know works
move back old things + make 3 less sql calls on default installs
fix back
back