Readd option for empty query