removed static
cleaned up code
Merge branch 'backup_zoekfunctie'