Merge branch 'release/0.2.1' into develop
change it here too, since I already messed up master
Fix case where this is called before confirmation has completed.

..in which case there is no Preference yet, only a Confirmation entry.
Add more filter query methods.
0.2.2
Merge branch 'release/0.2.2'