Filter bills by is_active flag
Markup cleanup