MOB-149 Added an id to the info window and select on id and tag instead