Osng 471

This pull request contains all changes for userstory #OSNG-471.
wouldn't it be better just to take an QueryBuilder and to to have multiple parameters which can be null? Like in line 19 and 28 it is hard to understand what are the nulls for.