Added option for 'where' in filter builder