Fixed some queries, fixed Excel export function