Simplify the logic for Add Data button

refer to search include dv for command permission