Added a parameter to BuilderBase::addBuilderFilter to prevent modifying builder multiple times.