[#85130544] adding selected and disabled states