refactor bills search