Generic search criteria creation modified - Inlined.