Fixed search
Fixed graph as well