Fixing minor bugs and rearranging the code in the files for consistency
Fixing bug where existing comparisons were not being loaded into the Filter Widget properly.