Fixing join aliases generated by Query\Builder