Fixed issue with options showing on non-option types