added support for points of interest, testing with tabbed and shingled panels