Fixed call to unexisting method
Added sorting, fixed headers