Cleaned up highlight filter a bit more.
Moved the sorting of the devices into Angular filters instead of having them in the main controller.