AI-818: Treat location types differently