improved formatting and filter options