Added regex match for node names and block devs