Revert "Revert "Condition that screen be a post or page not needed""

This reverts commit ef6ff9d7d66e780e02b86d0f6f977279dbf285e9.