Fixes for find all related