Sort keys and fix error adding new keys
Filter null data from graphs