Issue 2 fixed

The problem where *filtering* (not sorting) was not possibel has been
fixed and some rework on the design has also been implemented.