Refined layer retrieval from operationalLayers structure

Also fixed logic in search results label creation