Make filter and sort work together

[tagazok]

If filter is set, sort is deactivated.
If sort is set, filter is deactivated.

They need to work together.

[tagazok]

I reopen this issue as it seems "sort by" is not working anymore