Fixed more queries