Cleanup
Change ParameterMapping back to an interface. The xstreampersister gets confused by superclass setter/getters and sometimes may miss storing those fields. Add storedQueryId to the configuration