C3 marwa 39 submit edit idea

@mnzaki @muhammedabuali 
these are fixes after the new changes to relations and only counter caches are not working properly yet.