Fixed Issue - Using angular's $filter can lead to wrong value being displayed