Modification the way I navigate in the app. I change from the related attribute datasource to normal data class datasource so I have a better way to handle myself the queries and the refresh. + Starting the comments of the code