fixed problem with &&, ||,

still problem with switch during retracing
substr1, substr2, regex1 are not working