optimize query, update readme