Added complex search builder with and/or, added unum and pg num filters