foo
Fix id and query to not step on each other for rest requests.  working on cleaning up system tests