Something fixes and sorting by category