fix SF.compose
fix EntityBase types and typeNiceNames
fix options templates