Only apply live updates during main query and fix dashboard live updates bug

Resolves #675 

@shadyvb please review
:+1: