Fix some slow watches

As identified by Batarang. Apparently Angular is really dumb about
filters.