be more generic
be less strict about search; accept lots of things not just postal
update usage