Bugfix + Added search criterias