Two feature request on calendula apps for next development