|#1465| Vinay| enhancing search on supervisory node and geo zones