Composition - Nano Entity View/Edit page fix