Rename pop_query_d to pop_query and remove useless arg