update default query. previous one doesn't work well