Merge pull request #7 from PidgeyL/master

Bugfixes, merge and new features
Merge pull request #8 from PidgeyL/master

fix merge screw-up
Merge pull request #9 from PidgeyL/master

fix merge screw-up
Merge remote-tracking branch 'upstream/master'
make the filter page keep the settings after the search