Improving Estimation of Labor Market Disequilibrium through Inclusion of Shortage Indicators