Fixing STKP report and edit