Refactor of target and query submission continues