Add arrangement filtering in API