Updating query
Fixing popup