More fixes for white space in table names #40