fixing disambiguation without context store

fix trying to loop in null object

defensive in getOrElse

getting rid of usless conditional

adding defaultContextSimilarity