Fix issue where wrong data is loaded into controls directive