Done some refactoring
Made the job searh async. This fixes #20