Added filtering and angularjs magic on sheit