Readded original logQuery, and added logQueryManually