fixed sql queries to use lazy loading includes