Removed public flag from query until its active everywhere