Update all core SELECT's to new SQL class