Fixed bug with arguments not being passed and handler missing selected id.