Consolidate solution lookup logic into single place
Add a comment