APD-202: Initially previous map in popup bug, fixed