refactored, created searchQuery interface based, NativeSearchQueryBuilder support