Map bus icon logic optimization

As a result the popup will stop hiding automatically
and hopefully this will fix map memory leak.