Refactored group by watching into directive to get clear filter working.