join switched to joins for all queries