Merge with last modifications

Update of Dto query search
Merge with last modifications
 Update Protos
 Module search optimizations
comment debug output