data query page fixes