Added more queries and information about them into results