Add findProperty and fix html scope names.