search dsl fixes