Avoid Map tier

Log fix and fixed a places, which was iterating over Map, even you had the key