Ajay/Dileep | #3286 | Restrict entities fetched for displaying on the map