Further selector var fixes
Further selector var fixes

advocacycommons/advocacycommons,matinieves/advocacycommons,agustinrhcp/advocacycommons,advocacycommons/advocacycommons,agustinrhcp/advocacycommons,agustinrhcp/advocacycommons,matinieves/advocacycommons,matinieves/advocacycommons,advocacycommons/advocacycommons