Fix employer lookup
Commit fixes to enable merge back to dev