includes outside tag filtering in polling and some markup ammendments