Added additional sort and filter options