Continued re-factor of query submission