Fix regression on turntables/wlog
Fix sql error, cleanup code now that Turntables is used.
Separating things into commands.