improved search model generator.