fixed excessive queries, remote server test run