fixed more bugs using search pattern context.*.contains*(*getSort())''
fixed two more bugs