Finish implementing selection in entities list