Fix create and display entities