#64 Select option can be added on loading entity state