Improved policy controller. Fixed check box issue