Better compatibility when editing existing query. (adding "AND" and "OR" in between).