filters: Fixup subfield listing for organizations
oops: Fix bad merge for list properties as sub-fields
Merge pull request #1361 from greezybacon/issue/1308

oops: Fix bad merge for list properties as sub-fields

Reviewed-By: Peter Rotich <peter@osticket.com>