Use more smart way to show map