updating fixing missed generators issuses

- fix: missing end
- added sortable? condition to include order by position clause