Fix site issues (current site not filtered)