fix issue #259
fix issues #259 and #261
Merge branch 'master' into devel-nested-agents
return only entities which the user have control in editables select (ref: #437)