In the middle of fixing map tag searching