Merge branch 'feature/load_specific_data_on_filter_or_search' into develop