towards better query