improve joins parser - accept just name and maybe alias