Separated merge helpers into entity files.
Merged a few duplicated display functions into merge_helper. Improved formatting of subscribed users.
Fixed failing spec.