Added condition to not to filter if element's value is 'all'