Slightly improve func app flatness
Include also column restrictions