fix search null property
gitMerge branch 'master' of https://github.com/mcr77/DD-ACLabs