TMDM-7485 : Adjusting FK search list logic.