Merge "Fix saved query names cutoff"