fix hardcoded table names. LP#1273540, LP#1265589
release 2.3.6