Refactor expression functions
Make expressions compatible with point layers