fixed queriesg