Simplify generated query string
Fix exceptions on null TechnicallSkill name