Added TODO stop sending empty queries