Feature/insight fixes