fixed limited query None errors