Filtering added
id and formatting fixes
more filter fixes
filterfixes