allow open pay_batches to be included in search
fix warnings on upgrade, #22121