Adding join support, added extra checks for field/columns so we dont escape something like "a.column"