Added more queries and frontend content