added fields to group-by statements so it stops raising errors in strict mode
corrected filter in form_thirdparty call
Merge pull request #1126 from csalvador/marginfix

Marginfix