Fixes related to Work Association/Relation search