Improve and fix GRAPHINFO and FIELDINFO #3