fix laserTables being mapped as "null" and remap them
fix style
Merge pull request #2059 from AEnterprise/6.1.x

fix laserTables being mapped as "null" and remap them