split submit_query into submit_plain_query and submit_rpc
flake8