Updated API toolkit to cope with the preferred joins in the view XML