cleanups
fixed custom layout problem
term conversion lift + now deals with mandatory + has filter omit id function