Corrected mapping problem in table selection model