removed pagination, added filtering, added blank to choices