The highlight issue ..
Merge branch 'idms' of github.com:periscope-ps/periscope into idms
Map fix