Disable unavailable STIDs
Option handling tweak