Moved methods used to build filter to FilterBuilder class