Changed the logic of adding the search conditions so as to not have
where clauses added in the initial configuration conflict with the
search parameters