Fix organization, add extra filters.