cleaned up unwanted files, added criteria query to fetch embedded items and join items