[LF] [53066765] query string improvements