fixes to stash where clauses & backport 4.3 empty field fix
fixes to filter contributions after contacts have been filtered