Adding filter to subquery to improve selectiveness against payment objec...

...t with over 100k rows.
# Warning
# Info
# Issues
Fixes #1057