according to new queries in main project