Fixed bug that caused the Escape key not to work correctly in certain circumstances
Correction to point pop ups