Sisyphus: Fixed some issues with performance check on queries.