Improved query syntax, failure generator and propagator from diversify as samples