Correct table usage for data_entity_master
Clean
New methods to controller and angular updates