Fixed query by id