added angular filter and sort