Fix query string
Nice alert messages