Fixes handlers for node control elements

Closes-Bug: #1257731

Change-Id: If717b8baf5b0f5c3ad12c13b94e522b8c261dc8d