- add functions calls (without params)
- remove overlapped term pattern