Add fixes so that alert returns actual results (incorrect)