diff --git a/html/includes/common/generic-graph.inc.php b/html/includes/common/generic-graph.inc.php
index 038154e5c..c7425d5a0 100644
--- a/html/includes/common/generic-graph.inc.php
+++ b/html/includes/common/generic-graph.inc.php
@@ -204,6 +204,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_device.ttAdapter(),
+ limit: '.$config['typeahead_limit'].',
async: false,
templates: {
header: "
Devices
",
@@ -240,6 +241,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_port.ttAdapter(),
+ limit: '.$config['typeahead_limit'].',
async: false,
templates: {
header: " Ports
",
@@ -275,6 +277,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_application.ttAdapter(),
+ limit: '.$config['typeahead_limit'].',
async: false,
templates: {
header: " Applications
",
@@ -312,6 +315,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_munin.ttAdapter(),
+ limit: '.$config['typeahead_limit'].',
async: false,
templates: {
header: " Munin
",
@@ -346,6 +350,7 @@ function '.$unique_id.'() {
},
{
source: '.$unique_id.'_bill.ttAdapter(),
+ limit: '.$config['typeahead_limit'].',
async: false,
templates: {
header: " Bill
",
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index afc91e645..3bccd6590 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -717,6 +717,7 @@ $('#gsearch').typeahead({
},
{
source: devices.ttAdapter(),
+ limit: '',
async: true,
display: 'name',
valueKey: 'name',
@@ -727,6 +728,7 @@ $('#gsearch').typeahead({
},
{
source: ports.ttAdapter(),
+ limit: '',
async: true,
display: 'name',
valueKey: 'name',
@@ -737,6 +739,7 @@ $('#gsearch').typeahead({
},
{
source: bgp.ttAdapter(),
+ limit: '',
async: true,
display: 'name',
valueKey: 'name',
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 3dac116ad..8d763310d 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -870,4 +870,7 @@ $config['ignore_unmapable_port'] = False;
// InfluxDB default configuration
$config['influxdb']['timeout'] = 0;
-$config['influxdb']['verifySSL'] = false;
\ No newline at end of file
+$config['influxdb']['verifySSL'] = false;
+
+// Typeahead default configuration
+$config['typeahead_limit'] = 5;