Add a simple query cleanup, Add an expected JSON