Tweaked DSL
Fixed blocking. Changed types to optional in count and search dsls