published/unpublished default filter fix
minor refactoring