Make data browser switching more specific