Changing Find Properties behavior