Fixed the GUI to handle updated retrieve commands