Add ability to select all columns from specific table when using join