diff --git a/centreon/common/airespace/snmp/mode/apstatus.pm b/centreon/common/airespace/snmp/mode/apstatus.pm
index 53f421367..c3e230234 100644
--- a/centreon/common/airespace/snmp/mode/apstatus.pm
+++ b/centreon/common/airespace/snmp/mode/apstatus.pm
@@ -161,7 +161,7 @@ sub run {
     $self->manage_selection();
     
     my $multiple = 1;
-    if (scalar(keys %{$self->{ap_selected}}) == 1) {
+    if (scalar(keys %{$self->{ap_selected}}) <= 1) {
         $multiple = 0;
     }
     
@@ -234,15 +234,19 @@ my $mapping3 = {
     bsnAPAdminStatus        => { oid => '.1.3.6.1.4.1.14179.2.2.1.1.37', map => \%map_admin_status },
 };
 
+my $oid_agentInventoryMachineModel = '.1.3.6.1.4.1.14179.1.1.1.3';
+
 sub manage_selection {
     my ($self, %options) = @_;
 
     $self->{ap_selected} = {};
-    $self->{results} = $self->{snmp}->get_multiple_table(oids => [ { oid => $mapping->{bsnAPName}->{oid} },
+    $self->{results} = $self->{snmp}->get_multiple_table(oids => [ { oid => $oid_agentInventoryMachineModel },
+                                                                   { oid => $mapping->{bsnAPName}->{oid} },
                                                                    { oid => $mapping2->{bsnAPOperationStatus}->{oid} },
                                                                    { oid => $mapping3->{bsnAPAdminStatus}->{oid} },
                                                                  ],
                                                          nothing_quit => 1);
+    $self->{output}->output_add(long_msg => "Model: " . $self->{results}->{$oid_agentInventoryMachineModel}->{$oid_agentInventoryMachineModel . '.0'});
     foreach my $oid (keys %{$self->{results}->{ $mapping->{bsnAPName}->{oid} }}) {
         $oid =~ /^$mapping->{bsnAPName}->{oid}\.(.*)$/;
         my $instance = $1;
@@ -251,7 +255,7 @@ sub manage_selection {
         my $result3 = $self->{snmp}->map_instance(mapping => $mapping3, results => $self->{results}->{ $mapping3->{bsnAPAdminStatus}->{oid} }, instance => $instance);
         if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
             $result->{bsnAPName} !~ /$self->{option_results}->{filter_name}/) {
-            $self->{output}->output_add(long_msg => "Skipping  '" . $result->{bsnAPName} . "': no matching filter.");
+            $self->{output}->output_add(long_msg => "Skipping  '" . $result->{bsnAPName} . "': no matching filter.", debug => 1);
             next;
         }
         
@@ -260,8 +264,8 @@ sub manage_selection {
     }
     
     if (scalar(keys %{$self->{ap_selected}}) <= 0) {
-        $self->{output}->add_option_msg(short_msg => "No entry found.");
-        $self->{output}->option_exit();
+        $self->{output}->output_add(severity => 'OK',
+                                    short_msg => 'No AP associated (can be: slave wireless controller or your filter)');
     }
 }
 
diff --git a/centreon/common/airespace/snmp/mode/apusers.pm b/centreon/common/airespace/snmp/mode/apusers.pm
index b7ec0e16e..63834926b 100644
--- a/centreon/common/airespace/snmp/mode/apusers.pm
+++ b/centreon/common/airespace/snmp/mode/apusers.pm
@@ -221,16 +221,20 @@ my $mapping2 = {
     bsnMobileStationSsid    => { oid => '.1.3.6.1.4.1.14179.2.1.4.1.7' },
 };
 
+my $oid_agentInventoryMachineModel = '.1.3.6.1.4.1.14179.1.1.1.3';
+
 sub manage_selection {
     my ($self, %options) = @_;
 
     $self->{global} = { total => 0, total_idle => 0, total_aaapending => 0, total_authenticated => 0,
                         total_associated => 0, total_powersave => 0, total_disassociated => 0,
                         total_tobedeleted => 0, total_probing => 0, total_blacklisted => 0};
-    $self->{results} = $self->{snmp}->get_multiple_table(oids => [ { oid => $mapping->{bsnMobileStationStatus}->{oid} },
+    $self->{results} = $self->{snmp}->get_multiple_table(oids => [ { oid => $oid_agentInventoryMachineModel },
+                                                                   { oid => $mapping->{bsnMobileStationStatus}->{oid} },
                                                                    { oid => $mapping2->{bsnMobileStationSsid}->{oid} },
                                                                  ],
                                                          nothing_quit => 1);
+    $self->{output}->output_add(long_msg => "Model: " . $self->{results}->{$oid_agentInventoryMachineModel}->{$oid_agentInventoryMachineModel . '.0'});
     foreach my $oid (keys %{$self->{results}->{ $mapping->{bsnMobileStationStatus}->{oid} }}) {
         $oid =~ /^$mapping->{bsnMobileStationStatus}->{oid}\.(.*)$/;
         my $instance = $1;