Bugfix. Find entry when subject context is null. Was converting to string, then strict comparing, thus never finding matches.
Added method to clean references.
Merge branch 'master' into experimental