Fixed up the main window for additional query options