[BUGFIX] ADWD-1361 map shows fewer markers due to fetchMaximum
Merge branch 'ADWD-1361' into develop