transitions between key and map should work properly now