Touch event fixes for infoWindow and optimization