norm.clone & many improvements to query wrapper