Resolve "selected entries does not work properly"

Merged Mohammad Nakhaee requested to merge 1283-selected-entries-does-not-work-properly into develop

Merge request reports