making saved search queries more robust