Fixing bugs that appeared as a result of removal of results