fix PersonData filter that was causing person_area to be joined twice

[struan]

Construct a single filter clause that handles all the filtering rather than use two filter clauses as the latter approach resulted in two join clauses in the SQL which was leading to repeated results in the table view.

Fixes #590