Fixed parser to parse correctly to the GUI

parser fixes