Merge branch 'searchbug'
authorYrjan A. F. Fraschetti <yrjanaff@1x-193-157-241-240.uio.no>
Sun, 6 Dec 2015 11:54:42 +0000 (12:54 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@1x-193-157-241-240.uio.no>
Sun, 6 Dec 2015 11:54:42 +0000 (12:54 +0100)
Mostly bugfixes regarding search an filter


Trivial merge