Sergei's Q3 fixes, Filter Option, and self.adjacency_list conditional fix.