Changes to set_query

Still fixing up some loose ends and debugging the strings before I move
on to injecting current page/post method, merging query_str matches
method, and/or the query method.