Added non-tag skip options