Fix for screening results
Fix indexes