Brandon - Fixed the checkbox to update if the entity is selected or not