Fixes for relate field