added collection paths and JOINs
fixed column name in native query