update queries, add survey modal check