Moved queries into board store