Added filtering option
Added default order