Fix for default filters & stop disabling merge links in hrm/person (Dominic pls review both)