Fix - take bydisplay:...

See commit details.

Also, autoformats, yay!


ED: Added second commit. Yay consistent meta!
Again, view actual commit for details.