fixed more queries