Fixing restricted model dropdown support