Added initial query popup.
Merge with sprint4.