Regular singers functionality now working again (except import/export)