Fix for #541
More hardcoded table names #541
Updated changelog, bumped version.