fix time query and remove generic sample queries