Consolidating page type logic, started the content type filter