filter and optional add in explanation query builder bugfix