Added filter option
Added filter and formats