Added severity to logging
Added searching