Fixes on licenceProp search, filtering subs(to be reviewed)
Merge branch '4.2-dev' into newdev